diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-10-15 23:04:54 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-10-15 23:04:54 +0000 |
| commit | a15785bb5b644d92ea27b247d01be4f87b46307c (patch) | |
| tree | dc69fc7fa0fcd3988a18ae6f648704e22ad011ab | |
| parent | 7e0344a77084aa6db572ecc4224995fb49bc7d8a (diff) | |
| download | bcm5719-llvm-a15785bb5b644d92ea27b247d01be4f87b46307c.tar.gz bcm5719-llvm-a15785bb5b644d92ea27b247d01be4f87b46307c.zip | |
Re-enable linker scripts after fixing bad CMake
llvm-svn: 250472
| -rw-r--r-- | libcxx/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index b129838b004..0d60eef2a4e 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -76,14 +76,14 @@ option(LIBCXX_ENABLE_STATIC_ABI_LIBRARY "Statically link the ABI library" OFF) # On UNIX platforms other than Apple unless 'LIBCXX_ENABLE_STATIC_ABI_LIBRARY' # is on. set(ENABLE_LINKER_SCRIPT_DEFAULT_VALUE OFF) -if (LLVM_HAVE_LINK_VERSION_SCRIPT AND NOT LIBCXX_ENABLE_STATIC_ABI_LIBRARY) +if (LLVM_HAVE_LINK_VERSION_SCRIPT AND NOT LIBCXX_ENABLE_STATIC_ABI_LIBRARY + AND PYTHONINTERP_FOUND) set(ENABLE_LINKER_SCRIPT_DEFAULT_VALUE ON) endif() -#FIXME(EricWF) option(LIBCXX_ENABLE_ABI_LINKER_SCRIPT "Use and install a linker script for the given ABI library" - OFF) #${ENABLE_LINKER_SCRIPT_DEFAULT_VALUE}) + ${ENABLE_LINKER_SCRIPT_DEFAULT_VALUE}) # Build libc++abi with libunwind. We need this option to determine whether to # link with libunwind or libgcc_s while running the test cases. diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index d02b8c5f41e..ec3085b4879 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -140,7 +140,7 @@ if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT) # is a target name and not a library. Ex cxxabi_shared. set(SCRIPT_ABI_LIBNAME "${LIBCXX_CXX_ABI_LIBRARY}") if (SCRIPT_ABI_LIBNAME STREQUAL "cxxabi_shared") - set("${SCRIPT_ABI_LIBNAME}" "c++abi") + set(SCRIPT_ABI_LIBNAME "c++abi") endif() # Generate a linker script inplace of a libc++.so symlink. Rerun this command # after cxx builds. |
