Author: hans Date: Tue Aug 12 12:32:07 2014 New Revision: 215463 URL: http://llvm.org/viewvc/llvm-project?rev=215463&view=rev Log: [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 Modified: libcxx/trunk/lib/CMakeLists.txt Modified: libcxx/trunk/lib/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=215463&r1=215462&r2=215463&view=diff ============================================================================== --- libcxx/trunk/lib/CMakeLists.txt (original) +++ libcxx/trunk/lib/CMakeLists.txt Tue Aug 12 12:32:07 2014 @@ -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 _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
