Skip to content

Commit 367b91a

Browse files
authored
[NFC][CFI] Fix setup of UBSAN_TEST_HAS_CFI (#137424)
For #137245
1 parent a74e4ac commit 367b91a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

compiler-rt/test/ubsan_minimal/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ foreach(arch ${UBSAN_TEST_ARCH})
1313
string(TOLOWER "-${arch}-${OS_NAME}" UBSAN_TEST_CONFIG_SUFFIX)
1414
get_test_cc_for_arch(${arch} UBSAN_TEST_TARGET_CC UBSAN_TEST_TARGET_CFLAGS)
1515
set(CONFIG_NAME ${arch})
16-
set(UBSAN_TEST_HAS_CFI ${arch} IN_LIST CFI_SUPPORTED_ARCH)
16+
if(${arch} IN_LIST CFI_SUPPORTED_ARCH)
17+
set(UBSAN_TEST_HAS_CFI TRUE)
18+
else()
19+
set(UBSAN_TEST_HAS_CFI FALSE)
20+
endif()
1721
pythonize_bool(UBSAN_TEST_HAS_CFI)
1822
configure_lit_site_cfg(
1923
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in

compiler-rt/test/ubsan_minimal/lit.site.cfg.py.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ config.name_suffix = "@UBSAN_TEST_CONFIG_SUFFIX@"
55
# Tool-specific config options.
66
config.target_cflags = "@UBSAN_TEST_TARGET_CFLAGS@"
77
config.target_arch = "@UBSAN_TEST_TARGET_ARCH@"
8-
config.test_cfi = "@UBSAN_TEST_HAS_CFI_PYBOOL@"
8+
config.test_cfi = @UBSAN_TEST_HAS_CFI_PYBOOL@
99

1010
# Load common config for all compiler-rt lit tests.
1111
lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")

0 commit comments

Comments
 (0)