From c56c9cffe67497338499856203a9fe07e505f902 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Tue, 27 Nov 2018 21:13:31 +0000 Subject: [PATCH] [libcxx] Make sure the re-export logic works when paths contain spaces git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@347711 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 4ec2f8450..354da21a5 100644 --- a/lib/CMakeLists.txt +++ b/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()