[PATCH] D52394: [libcxx] Fix the definition of the check-cxx-abilist target on Darwin

[Louis Dionne via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL342813: [libcxx] Fix the definition of the check-cxx-abilist target on Darwin (authored by ldionne, committed by ).
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D52394?vs=166613&id=166617#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D52394

Files:
  libcxx/trunk/lib/abi/CMakeLists.txt


Index: libcxx/trunk/lib/abi/CMakeLists.txt
===================================================================
--- libcxx/trunk/lib/abi/CMakeLists.txt
+++ libcxx/trunk/lib/abi/CMakeLists.txt
@@ -1,12 +1,16 @@
 
 if (DEFINED TARGET_TRIPLE)
-    # Ignore the major, minor, and patchlevel versions of darwin targets.
-    string(REGEX REPLACE "darwin[0-9]+\\.[0-9]+\\.[0-9]+" "darwin"
-           GENERIC_TARGET_TRIPLE "${TARGET_TRIPLE}")
-
-    # Ignore the major and minor versions of freebsd targets.
-    string(REGEX REPLACE "freebsd[0-9]+\\.[0-9]+" "freebsd"
-           GENERIC_TARGET_TRIPLE "${TARGET_TRIPLE}")
+    if (TARGET_TRIPLE MATCHES "darwin")
+        # Ignore the major, minor, and patchlevel versions of darwin targets.
+        string(REGEX REPLACE "darwin[0-9]+\\.[0-9]+\\.[0-9]+" "darwin"
+               GENERIC_TARGET_TRIPLE "${TARGET_TRIPLE}")
+    elseif(TARGET_TRIPLE MATCHES "freebsd")
+        # Ignore the major and minor versions of freebsd targets.
+        string(REGEX REPLACE "freebsd[0-9]+\\.[0-9]+" "freebsd"
+               GENERIC_TARGET_TRIPLE "${TARGET_TRIPLE}")
+    else()
+        set(GENERIC_TARGET_TRIPLE "${TARGET_TRIPLE}")
+    endif()
 endif()
 
 # Detect if we are building in the same configuration used to generate


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D52394.166617.patch
Type: text/x-patch
Size: 1264 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180922/3c458856/attachment.bin>