diff options
| author | Hans Wennborg <hans@hanshq.net> | 2014-08-12 17:32:07 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2014-08-12 17:32:07 +0000 |
| commit | 4714826262ae77dec341eefa9887d0b930fce0ad (patch) | |
| tree | 04fe3bb28edd083eb7967c637e4467b0a73b8ce2 /libcxx/lib | |
| parent | e5ca27d716ef2c17366b99a41fe0001c99b289b8 (diff) | |
| download | bcm5719-llvm-4714826262ae77dec341eefa9887d0b930fce0ad.tar.gz bcm5719-llvm-4714826262ae77dec341eefa9887d0b930fce0ad.zip | |
[libc++] Fix the CMake build on Mac when setting MACOSX_DEPLOYMENT_TARGET=10.6
The build file was trying to use LIBCXX_VERSION, which isn't set
anywhere, and also forgot to split the 'compile_flags' list.
Differential Revision: http://reviews.llvm.org/D4860
llvm-svn: 215463
Diffstat (limited to 'libcxx/lib')
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index a29b6cc30dc..d56ade4f2fd 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -54,7 +54,7 @@ if ( APPLE ) list(APPEND compile_flags "-U__STRICT_ANSI__") list(APPEND link_flags "-compatibility_version 1" - "-current_version ${LIBCXX_VERSION}" + "-current_version 1" "-install_name /usr/lib/libc++.1.dylib" "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" @@ -84,6 +84,7 @@ if ( APPLE ) endif() endif() +string(REPLACE ";" " " compile_flags "${compile_flags}") string(REPLACE ";" " " link_flags "${link_flags}") set_target_properties(cxx |
