[llvm] dedeb66 - Make lit configs relocatable again after c747b7d1d9a

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2021-06-22T15:27:32-04:00
New Revision: dedeb661911188a8022e8c6a51cb212a2dbeb82c

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

LOG: Make lit configs relocatable again after c747b7d1d9a

See https://reviews.llvm.org/D77184 for background.

Added: 
    

Modified: 
    llvm/test/CMakeLists.txt
    llvm/test/lit.site.cfg.py.in

Removed: 
    


################################################################################
diff  --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt
index 8da840edf7cb..ddc6e645c8ba 100644
--- a/llvm/test/CMakeLists.txt
+++ b/llvm/test/CMakeLists.txt
@@ -26,6 +26,7 @@ configure_lit_site_cfg(
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
   PATHS
+  "CMAKE_OSX_SYSROOT"
   "LLVM_SOURCE_DIR"
   "LLVM_BINARY_DIR"
   "LLVM_TOOLS_DIR"

diff  --git a/llvm/test/lit.site.cfg.py.in b/llvm/test/lit.site.cfg.py.in
index b02903b1d6c0..fd39e78e91a5 100644
--- a/llvm/test/lit.site.cfg.py.in
+++ b/llvm/test/lit.site.cfg.py.in
@@ -17,7 +17,7 @@ config.errc_messages = "@LLVM_LIT_ERRC_MESSAGES@"
 config.python_executable = "@Python3_EXECUTABLE@"
 config.gold_executable = "@GOLD_EXECUTABLE@"
 config.ld64_executable = "@LD64_EXECUTABLE@"
-config.osx_sysroot = "@CMAKE_OSX_SYSROOT@"
+config.osx_sysroot = path(r"@CMAKE_OSX_SYSROOT@")
 config.ocamlfind_executable = "@OCAMLFIND@"
 config.have_ocamlopt = @HAVE_OCAMLOPT@
 config.have_ocaml_ounit = @HAVE_OCAML_OUNIT@