Move static config for target LLVM into caches

weliveindetail · weliveindetail · commit 186f4358fab4 · 2025-01-24T12:40:20.000+01:00
diff --git a/cmake/caches/LLVM-Android-x86_64.cmake b/cmake/caches/LLVM-Android-x86_64.cmake
@@ -0,0 +1,10 @@
+set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR YES CACHE BOOL "")
+
+set(COMPILER_RT_DEFAULT_TARGET_ONLY    YES CACHE BOOL "")
+set(COMPILER_RT_BUILD_BUILTINS         NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_CRT              NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_LIBFUZZER        NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_ORC              NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_XRAY             NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_PROFILE          YES CACHE BOOL "")
+set(COMPILER_RT_BUILD_SANITIZERS       YES CACHE BOOL "")
diff --git a/cmake/caches/LLVM-Windows-x86_64.cmake b/cmake/caches/LLVM-Windows-x86_64.cmake
@@ -0,0 +1,10 @@
+set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR YES CACHE BOOL "")
+
+set(COMPILER_RT_DEFAULT_TARGET_ONLY    YES CACHE BOOL "")
+set(COMPILER_RT_BUILD_BUILTINS         NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_CRT              NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_LIBFUZZER        NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_ORC              NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_XRAY             NO  CACHE BOOL "")
+set(COMPILER_RT_BUILD_PROFILE          YES CACHE BOOL "")
+set(COMPILER_RT_BUILD_SANITIZERS       YES CACHE BOOL "")
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1626,11 +1626,10 @@ function Build-Sanitizers([Platform]$Platform, $Arch) {
     -Platform $Platform `
     -UseBuiltCompilers C,CXX `
     -BuildTargets "install-compiler-rt" `
+    -CacheScript $SourceCache\swift\cmake\caches\LLVM-$Platform-$($Arch.LLVMName).cmake `
     -Defines (@{
       CMAKE_SYSTEM_NAME = $Platform.ToString();
       LLVM_DIR = "$LLVMTargetCache\lib\cmake\llvm";
-      LLVM_ENABLE_PER_TARGET_RUNTIME_DIR = "YES";
-      COMPILER_RT_DEFAULT_TARGET_ONLY = "YES";
     })
   
   Build-CMakeProject `
@@ -1641,18 +1640,10 @@ function Build-Sanitizers([Platform]$Platform, $Arch) {
     -Platform $Platform `
     -UseBuiltCompilers C,CXX `
     -BuildTargets "install-compiler-rt" `
+    -CacheScript $SourceCache\swift\cmake\caches\LLVM-$Platform-$($Arch.LLVMName).cmake `
     -Defines (@{
       CMAKE_SYSTEM_NAME = $Platform.ToString();
       LLVM_DIR = "$LLVMTargetCache\lib\cmake\llvm";
-      LLVM_ENABLE_PER_TARGET_RUNTIME_DIR = "YES";
-      COMPILER_RT_DEFAULT_TARGET_ONLY = "YES";
-      COMPILER_RT_BUILD_BUILTINS = "NO";
-      COMPILER_RT_BUILD_CRT = "NO";
-      COMPILER_RT_BUILD_LIBFUZZER = "NO";
-      COMPILER_RT_BUILD_ORC = "NO";
-      COMPILER_RT_BUILD_XRAY = "NO";
-      COMPILER_RT_BUILD_PROFILE = "YES";
-      COMPILER_RT_BUILD_SANITIZERS = "YES";
     })
 }
 
