[libcxx] r250472 - Re-enable linker scripts after fixing bad CMake

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Thu Oct 15 18:04:54 2015
New Revision: 250472

URL: http://llvm.org/viewvc/llvm-project?rev=250472&view=rev
Log:
Re-enable linker scripts after fixing bad CMake

Modified:
    libcxx/trunk/CMakeLists.txt
    libcxx/trunk/lib/CMakeLists.txt

Modified: libcxx/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=250472&r1=250471&r2=250472&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Thu Oct 15 18:04:54 2015
@@ -76,14 +76,14 @@ option(LIBCXX_ENABLE_STATIC_ABI_LIBRARY
 # 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.

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=250472&r1=250471&r2=250472&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Thu Oct 15 18:04:54 2015
@@ -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.