libc++ PATCH: Fixes /lib/CMakeLists.txt for Apple ARM targets

[Quentin Fiard]

Dear all,

I have noticed that due to some minor syntax typos in /lib/CMakeLists.txt,
the file /lib/libc++abi.exp is incorrectly referenced as the reexported
symbol list for Apple ARM targets (it should instead be
/lib/libc++sjlj-abi.exp for these targets).

Please find in the following a patch to fix this issue on revision r206024.

Best regards,
Quentin

--- lib/CMakeLists.txt.old 2014-04-11 23:40:24.000000000 +0200
+++ lib/CMakeLists.txt 2014-04-11 23:41:50.000000000 +0200
@@ -60,9 +60,9 @@ if ( APPLE )

 "-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)
+    if ( NOT "${CMAKE_OSX_SYSROOT}" STREQUAL "" )
+      list(FIND CMAKE_OSX_ARCHITECTURES "armv7" OSX_HAS_ARMV7)
+      if ( NOT ${OSX_HAS_ARMV7} STREQUAL -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")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140411/add612ab/attachment.html>