[libcxx] r251062 - Disable linker scripts when the ABI library is not specified or is none.

[Eric Fiselier via cfe-commits]

Yeah, that review hasn't landed yet. It should be called auto, but we need
to make it actually "automatic". Currently "none" really means don't help
me, not that we will automatically figure it out for you. I agree with your
requested change, it's just a bunch of work that should probably be done on
it's own.



On Thu, Oct 22, 2015 at 10:57 AM, Jonathan Roelofs <
jonathan at codesourcery.com> wrote:

>
>
> On 10/22/15 2:50 PM, Eric Fiselier via cfe-commits wrote:
>
>> Author: ericwf
>> Date: Thu Oct 22 15:50:07 2015
>> New Revision: 251062
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=251062&view=rev
>> Log:
>> Disable linker scripts when the ABI library is not specified or is none.
>>
>> Modified:
>>      libcxx/trunk/CMakeLists.txt
>>
>> Modified: libcxx/trunk/CMakeLists.txt
>> URL:
>> http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=251062&r1=251061&r2=251062&view=diff
>>
>> ==============================================================================
>> --- libcxx/trunk/CMakeLists.txt (original)
>> +++ libcxx/trunk/CMakeLists.txt Thu Oct 22 15:50:07 2015
>> @@ -74,9 +74,12 @@ option(LIBCXX_ENABLE_STATIC_ABI_LIBRARY
>>   # Generate and install a linker script inplace of libc++.so. The linker
>> script
>>   # will link libc++ to the correct ABI library. This option is on by
>> default
>>   # On UNIX platforms other than Apple unless
>> 'LIBCXX_ENABLE_STATIC_ABI_LIBRARY'
>> -# is on.
>> +# is on. This option is also disabled when the ABI library is not
>> specified
>> +# or is specified to be "none".
>>   set(ENABLE_LINKER_SCRIPT_DEFAULT_VALUE OFF)
>>   if (LLVM_HAVE_LINK_VERSION_SCRIPT AND NOT
>> LIBCXX_ENABLE_STATIC_ABI_LIBRARY
>> +      AND LIBCXX_CXX_ABI
>> +      AND NOT LIBCXX_CXX_ABI STREQUAL "none"
>>
>
> I remember suggesting in a review that this be called "auto" rather than
> "none"... but now I can't find that review. Thoughts?
>
> Jon
>
>
>         AND PYTHONINTERP_FOUND)
>>       set(ENABLE_LINKER_SCRIPT_DEFAULT_VALUE ON)
>>   endif()
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>>
>>
> --
> Jon Roelofs
> jonathan at codesourcery.com
> CodeSourcery / Mentor Embedded
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20151022/5d110304/attachment.html>