From f3b94728c708df60741bf6c6f054f10c4474fd7f Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 22 Sep 2018 14:37:49 +0000 Subject: [PATCH] Similar to the handling of darwin target triples, strip the version numbers off of freebsd target triples, when generating the name of the ABI list file for check-cxx-abilist target. Also remove unnecessary parentheses in the regex for darwin, and slightly reword the comment. llvm-svn: 342805 --- libcxx/lib/abi/CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libcxx/lib/abi/CMakeLists.txt b/libcxx/lib/abi/CMakeLists.txt index e42e961..e65df03 100644 --- a/libcxx/lib/abi/CMakeLists.txt +++ b/libcxx/lib/abi/CMakeLists.txt @@ -1,9 +1,12 @@ if (DEFINED TARGET_TRIPLE) - # Ignore the major, minor, and patchlevel versions of the darwin - # target. - string(REGEX REPLACE "darwin([0-9]+)\\.([0-9]+)\\.([0-9]+)" "darwin" - GENERIC_TARGET_TRIPLE "${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}") endif() # Detect if we are building in the same configuration used to generate -- 2.7.4