maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

Summary:
r342805 added support for the check-cxx-abilist target on FreeBSD, but broke
the target on macOS in doing so. The problem is that the GENERIC_TARGET_TRIPLE
gets overwritten after replacing the FreeBSD regular expression, which
nullifies the replacement done with the darwin regular expression.

Reviewers: dim, EricWF

Subscribers: emaste, mgorny, krytarowski, christof, dexonsmith, cfe-commits, libcxx-commits

Differential Revision: https://reviews.llvm.org/D52394

llvm-svn: 342813
This commit is contained in:
Louis Dionne 2018-09-22 18:39:38 +00:00
parent 29f0282b3e
commit 8a15c924ae
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libcxx/lib/abi/CMakeLists.txt
View File

@ -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