summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Dionne <ldionne@apple.com>2018-11-27 21:13:31 +0000
committerLouis Dionne <ldionne@apple.com>2018-11-27 21:13:31 +0000
commit1497359501ca7ded198d0e399e7fd41da91cdb44 (patch)
tree415f38043563b1dba19775004a2fb4d7f94bd598
parentd4de439cf45ac3c0093ef2ec3bfe83cca8f0eaaa (diff)
downloadbcm5719-llvm-1497359501ca7ded198d0e399e7fd41da91cdb44.tar.gz
bcm5719-llvm-1497359501ca7ded198d0e399e7fd41da91cdb44.zip
[libcxx] Make sure the re-export logic works when paths contain spaces
llvm-svn: 347711
-rw-r--r--libcxx/lib/CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt
index 4ec2f845042..354da21a504 100644
--- a/libcxx/lib/CMakeLists.txt
+++ b/libcxx/lib/CMakeLists.txt
@@ -161,13 +161,13 @@ if (LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS)
add_link_flags(
"-compatibility_version 1"
"-install_name /usr/lib/libc++.1.dylib"
- "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
- "-Wl,-reexported_symbols_list,${RE_EXPORT_LIST}"
- "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp"
- "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/weak.exp")
+ "-Wl,-unexported_symbols_list,\"${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp\""
+ "-Wl,-reexported_symbols_list,\"${RE_EXPORT_LIST}\""
+ "-Wl,-force_symbols_not_weak_list,\"${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp\""
+ "-Wl,-force_symbols_weak_list,\"${CMAKE_CURRENT_SOURCE_DIR}/weak.exp\"")
if (NOT LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS)
- add_link_flags("-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi-new-delete.exp")
+ add_link_flags("-Wl,-reexported_symbols_list,\"${CMAKE_CURRENT_SOURCE_DIR}/libc++abi-new-delete.exp\"")
endif()
endif()
endif()
OpenPOWER on IntegriCloud