summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2015-10-22 20:50:07 +0000
committerEric Fiselier <eric@efcs.ca>2015-10-22 20:50:07 +0000
commit571367e0cda5bf56203b6ea8a68425a60287d079 (patch)
tree0f8509749e0a2adc68b130b19beaa59f0032f9f8
parentc6e28782d80b8c25a5e76e6a14d812f1f3bf294b (diff)
downloadbcm5719-llvm-571367e0cda5bf56203b6ea8a68425a60287d079.tar.gz
bcm5719-llvm-571367e0cda5bf56203b6ea8a68425a60287d079.zip
Disable linker scripts when the ABI library is not specified or is none.
llvm-svn: 251062
-rw-r--r--libcxx/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 0d60eef2a4e..0bbe5d46bf6 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -74,9 +74,12 @@ option(LIBCXX_ENABLE_STATIC_ABI_LIBRARY "Statically link the ABI library" OFF)
# 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"
AND PYTHONINTERP_FOUND)
set(ENABLE_LINKER_SCRIPT_DEFAULT_VALUE ON)
endif()
OpenPOWER on IntegriCloud