at 16.09-beta 39 lines 2.1 kB view raw
1--- libcxx-3.8.0.src.org/lib/CMakeLists.txt 2015-12-16 15:41:05.000000000 -0800 2+++ libcxx-3.8.0.src/lib/CMakeLists.txt 2016-06-17 19:40:00.293394500 -0700 3@@ -94,30 +94,30 @@ 4 add_definitions(-D__STRICT_ANSI__) 5 add_link_flags( 6 "-compatibility_version 1" 7 "-current_version 1" 8- "-install_name /usr/lib/libc++.1.dylib" 9- "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" 10+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib" 11+ "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" 12 "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" 13 "/usr/lib/libSystem.B.dylib") 14 else() 15 if ( ${CMAKE_OSX_SYSROOT} ) 16 list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) 17 if (OSX_HAS_ARMV7) 18 set(OSX_RE_EXPORT_LINE 19- "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" 20+ "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib" 21 "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") 22 else() 23 set(OSX_RE_EXPORT_LINE 24- "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") 25+ "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib") 26 endif() 27 else() 28- set(OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") 29+ set(OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") 30 endif() 31 32 add_link_flags( 33 "-compatibility_version 1" 34- "-install_name /usr/lib/libc++.1.dylib" 35+ "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib" 36 "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" 37 "${OSX_RE_EXPORT_LINE}" 38 "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp" 39 "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/weak.exp")