forked from OSchip/llvm-project
Re-enable linker scripts after fixing bad CMake
llvm-svn: 250472
This commit is contained in:
parent
7e0344a770
commit
a15785bb5b
|
@ -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.
|
||||||
|
|
|
@ -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.
|
||||||
|
|
Loading…
Reference in New Issue