Created
November 14, 2014 21:20
-
-
Save EricWF/ba7a415581da582ea14c to your computer and use it in GitHub Desktop.
cmake.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt | |
| index cd8553c..2a6df3d 100644 | |
| --- a/lib/CMakeLists.txt | |
| +++ b/lib/CMakeLists.txt | |
| @@ -55,27 +55,38 @@ append_if(link_flags LIBCXX_HAS_NODEFAULTLIBS_FLAG -nodefaultlibs) | |
| if ( APPLE ) | |
| if ( CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL "10.6" ) | |
| + if (LIBCXX_CXX_ABI_LIBNAME STREQUAL "libcxxabi" OR | |
| + LIBCXX_CXX_ABI_LIBNAME STREQUAL "none") | |
| + set(OSX_RE_EXPORT_LINE "-Wl,-reexport_library,/usr/lib/libc++abi.dylib") | |
| + else() | |
| + set(OSX_RE_EXPORT_LINE "") | |
| + endif() | |
| list(APPEND compile_flags "-U__STRICT_ANSI__") | |
| list(APPEND link_flags | |
| "-compatibility_version 1" | |
| "-current_version 1" | |
| "-install_name /usr/lib/libc++.1.dylib" | |
| - "-Wl,-reexport_library,/usr/lib/libc++abi.dylib" | |
| + "${OSX_RE_EXPORT_LINE}" | |
| "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" | |
| "/usr/lib/libSystem.B.dylib") | |
| else() | |
| - if ( ${CMAKE_OSX_SYSROOT} ) | |
| - list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) | |
| - if (OSX_HAS_ARMV7) | |
| - set(OSX_RE_EXPORT_LINE | |
| - "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" | |
| - "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") | |
| + if (LIBCXX_CXX_ABI_LIBNAME STREQUAL "libcxxabi" OR | |
| + LIBCXX_CXX_ABI_LIBNAME STREQUAL "none") | |
| + if ( ${CMAKE_OSX_SYSROOT} ) | |
| + list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) | |
| + if (OSX_HAS_ARMV7) | |
| + set(OSX_RE_EXPORT_LINE | |
| + "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib" | |
| + "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp") | |
| + else() | |
| + set(OSX_RE_EXPORT_LINE | |
| + "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") | |
| + endif() | |
| else() | |
| - set(OSX_RE_EXPORT_LINE | |
| - "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib") | |
| + set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") | |
| endif() | |
| else() | |
| - set (OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp") | |
| + set(OSX_RE_EXPORT_LINE "") | |
| endif() | |
| list(APPEND link_flags |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment