diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-08-30 00:54:37 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-08-30 00:54:37 +0000 |
| commit | 21125869eda7d58f74b875c3c109a1382639df32 (patch) | |
| tree | eeceef6db36aef20299c1c545711cd4972d0553d | |
| parent | 442d38c0b4782c45499e142bb75fa16a202653ed (diff) | |
| download | bcm5719-llvm-21125869eda7d58f74b875c3c109a1382639df32.tar.gz bcm5719-llvm-21125869eda7d58f74b875c3c109a1382639df32.zip | |
Fix PR28831 - Bad logic around CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES.
See https://llvm.org/bugs/show_bug.cgi?id=28831 for more information about
the changes.
llvm-svn: 280037
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index 37b54f39920..3abfd783172 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -105,9 +105,9 @@ if ( APPLE AND (LIBCXX_CXX_ABI_LIBNAME STREQUAL "libcxxabi" OR "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp" "/usr/lib/libSystem.B.dylib") else() - if ( ${CMAKE_OSX_SYSROOT} ) + if (DEFINED CMAKE_OSX_SYSROOT) list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7) - if (OSX_HAS_ARMV7) + if (NOT OSX_HAS_ARMV7 EQUAL -1) 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") |
