generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-enable linker scripts after fixing bad CMake

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@250472 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2015-10-15 23:04:54 +00:00
parent a7780301d8
commit 1d3716a633
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -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' # On UNIX platforms other than Apple unless 'LIBCXX_ENABLE_STATIC_ABI_LIBRARY'
# is on. # is on.
set(ENABLE_LINKER_SCRIPT_DEFAULT_VALUE OFF) 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) set(ENABLE_LINKER_SCRIPT_DEFAULT_VALUE ON)
endif() endif()
#FIXME(EricWF)
option(LIBCXX_ENABLE_ABI_LINKER_SCRIPT option(LIBCXX_ENABLE_ABI_LINKER_SCRIPT
"Use and install a linker script for the given ABI library" "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 # Build libc++abi with libunwind. We need this option to determine whether to
# link with libunwind or libgcc_s while running the test cases. # link with libunwind or libgcc_s while running the test cases.

2
lib/CMakeLists.txt
View File

@@ -140,7 +140,7 @@ if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
# is a target name and not a library. Ex cxxabi_shared. # is a target name and not a library. Ex cxxabi_shared.
set(SCRIPT_ABI_LIBNAME "${LIBCXX_CXX_ABI_LIBRARY}") set(SCRIPT_ABI_LIBNAME "${LIBCXX_CXX_ABI_LIBRARY}")
if (SCRIPT_ABI_LIBNAME STREQUAL "cxxabi_shared") if (SCRIPT_ABI_LIBNAME STREQUAL "cxxabi_shared")
set("${SCRIPT_ABI_LIBNAME}" "c++abi") set(SCRIPT_ABI_LIBNAME "c++abi")
endif() endif()
# Generate a linker script inplace of a libc++.so symlink. Rerun this command # Generate a linker script inplace of a libc++.so symlink. Rerun this command
# after cxx builds. # after cxx builds.