[compiler-rt] [compiler-rt] Propagate sysroot from CMake to msan tests (PR #132299)

[via llvm-commits]

https://github.com/zeroomega updated https://github.com/llvm/llvm-project/pull/132299

>From 74d3fd4840a116340ba0e17d32e085444cba6faf Mon Sep 17 00:00:00 2001
From: Haowei Wu <haowei at google.com>
Date: Thu, 20 Mar 2025 15:14:10 -0700
Subject: [PATCH] [compiler-rt] Propagate sysroot from CMake to msan tests

Some msan tests requires rpc/xdr.h, which is no longer available
in some newer glibc. In build systems with hermetic sysroot set through
CMake, this issue can be solved by setting the sysroot to CMAKE_SYSROOT
for these tests. This patch implements it.
---
 compiler-rt/lib/msan/tests/CMakeLists.txt | 1 +
 compiler-rt/test/msan/lit.cfg.py          | 5 +++++
 compiler-rt/test/msan/lit.site.cfg.py.in  | 1 +
 3 files changed, 7 insertions(+)

diff --git a/compiler-rt/lib/msan/tests/CMakeLists.txt b/compiler-rt/lib/msan/tests/CMakeLists.txt
index a8500225337e6..4d4d04372a817 100644
--- a/compiler-rt/lib/msan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/msan/tests/CMakeLists.txt
@@ -63,6 +63,7 @@ set(MSAN_UNITTEST_LINK_FLAGS
   # inputs.
 )
 
+append_list_if(CMAKE_SYSROOT "--sysroot=${CMAKE_SYSROOT}" MSAN_UNITTEST_LINK_FLAGS)
 append_list_if(COMPILER_RT_HAS_LIBDL -ldl MSAN_UNITTEST_LINK_FLAGS)
 
 macro(msan_compile obj_list source arch kind cflags)
diff --git a/compiler-rt/test/msan/lit.cfg.py b/compiler-rt/test/msan/lit.cfg.py
index 361be79e2557e..ab1fc667d97e0 100644
--- a/compiler-rt/test/msan/lit.cfg.py
+++ b/compiler-rt/test/msan/lit.cfg.py
@@ -18,6 +18,11 @@
     ]
     + [config.target_cflags]
     + config.debug_info_flags
+    + (
+        ["--sysroot", config.cmake_sysroot]
+        if config.cmake_sysroot and config.host_os == "Linux"
+        else []
+    )
 )
 # Some Msan tests leverage backtrace() which requires libexecinfo on FreeBSD.
 if config.host_os == "FreeBSD":
diff --git a/compiler-rt/test/msan/lit.site.cfg.py.in b/compiler-rt/test/msan/lit.site.cfg.py.in
index 47264d0986946..41231359692ed 100644
--- a/compiler-rt/test/msan/lit.site.cfg.py.in
+++ b/compiler-rt/test/msan/lit.site.cfg.py.in
@@ -6,6 +6,7 @@ config.target_cflags = "@MSAN_TEST_TARGET_CFLAGS@"
 config.target_arch = "@MSAN_TEST_TARGET_ARCH@"
 config.use_lld = @MSAN_TEST_USE_LLD@
 config.use_thinlto = @MSAN_TEST_USE_THINLTO@
+config.cmake_sysroot = "@CMAKE_SYSROOT@"
 
 # Load common config for all compiler-rt lit tests.
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")