[compiler-rt] 9531fc3 - Unbreak check-all on macOS after dbe8c2c316c40

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2022-12-06T10:19:58-05:00
New Revision: 9531fc37fb8b84e448144fc2318e28fa0654a47e

URL: https://github.com/llvm/llvm-project/commit/9531fc37fb8b84e448144fc2318e28fa0654a47e
DIFF: https://github.com/llvm/llvm-project/commit/9531fc37fb8b84e448144fc2318e28fa0654a47e.diff

LOG: Unbreak check-all on macOS after dbe8c2c316c40

`${X86_64}` expands to `x86_64;x86_64h` on macOS, so

    get_test_cc_for_arch(${X86_64} METADATA_TEST_TARGET_CC METADATA_TEST_TARGET_CFLAGS)

calls the macro get_test_cc_for_arch() with the four arguments
`x86_64`, `x86_64h`, `METADATA_TEST_TARGET_CC`, and `METADATA_TEST_TARGET_CFLAGS`.

This writes the compiler into a variable called x86_64h, the cflags into a
variable called METADATA_TEST_TARGET_CC, and silently ignores the fourth
parameter.

As a fix, just pass `x86_64` instead of `${X86_64}`. Hopefully
that won't break anything on other platforms.

Added: 
    

Modified: 
    compiler-rt/test/metadata/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/metadata/CMakeLists.txt b/compiler-rt/test/metadata/CMakeLists.txt
index 7f1befbbb8a46..3391a8961fbc0 100644
--- a/compiler-rt/test/metadata/CMakeLists.txt
+++ b/compiler-rt/test/metadata/CMakeLists.txt
@@ -5,7 +5,7 @@ if(CAN_TARGET_x86_64)
   set(METADATA_LIT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
   set(SANITIZER_COMMON_TEST_TARGET_ARCH ${X86_64})
-  get_test_cc_for_arch(${X86_64} METADATA_TEST_TARGET_CC METADATA_TEST_TARGET_CFLAGS)
+  get_test_cc_for_arch(x86_64 METADATA_TEST_TARGET_CC METADATA_TEST_TARGET_CFLAGS)
   configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
     ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)