commit 4e0376037d73a573543769060e54fdfeca3fc6a4
author Nico Weber <thakis@chromium.org> Tue Dec 06 10:17:35 2022 -0500
committer Copybara-Service <copybara-worker@google.com> Tue Dec 06 07:25:59 2022 -0800
tree 4073f367528e94b292da0522d08ce0a99ec7b632
parent 772af24cb3a54a67a5f7abb885d9943a2544893f

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.

GitOrigin-RevId: 9531fc37fb8b84e448144fc2318e28fa0654a47e

test/metadata/CMakeLists.txt

diff --git a/test/metadata/CMakeLists.txt b/test/metadata/CMakeLists.txt
index 7f1befb..3391a89 100644
--- a/test/metadata/CMakeLists.txt
+++ b/test/metadata/CMakeLists.txt
@@ -5,7 +5,7 @@
   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)