Merge pull request #82415 from compnerd/cmake-wiring

compnerd · web-flow · commit 376ce0564513 · 2025-06-24T07:48:05.000-07:00
utils: adopt `SwiftCore_DIR` in new builds
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -2380,8 +2380,7 @@ function Build-ExperimentalRuntime {
         CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
         CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
 
-        Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");
-        SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;
+        SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
       }
 
     Build-CMakeProject `
@@ -2399,8 +2398,7 @@ function Build-ExperimentalRuntime {
         CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
         CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
 
-        Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");
-        SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;
+        SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
       }
 
     Build-CMakeProject `
@@ -2418,8 +2416,7 @@ function Build-ExperimentalRuntime {
         CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
         CMAKE_SYSTEM_NAME = $Platform.OS.ToString();
 
-        Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");
-        SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;
+        SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";
       }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2380,8 +2380,7 @@ function Build-ExperimentalRuntime {`
`2380`	`2380`	`CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";`
`2381`	`2381`	`CMAKE_SYSTEM_NAME = $Platform.OS.ToString();`
`2382`	`2382`
`2383`		`- Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");`
`2384`		`- SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;`
	`2383`	`+ SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";`
`2385`	`2384`	`}`
`2386`	`2385`
`2387`	`2386`	Build-CMakeProject `
`@@ -2399,8 +2398,7 @@ function Build-ExperimentalRuntime {`
`2399`	`2398`	`CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";`
`2400`	`2399`	`CMAKE_SYSTEM_NAME = $Platform.OS.ToString();`
`2401`	`2400`
`2402`		`- Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");`
`2403`		`- SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;`
	`2401`	`+ SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";`
`2404`	`2402`	`}`
`2405`	`2403`
`2406`	`2404`	Build-CMakeProject `
`@@ -2418,8 +2416,7 @@ function Build-ExperimentalRuntime {`
`2418`	`2416`	`CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";`
`2419`	`2417`	`CMAKE_SYSTEM_NAME = $Platform.OS.ToString();`
`2420`	`2418`
`2421`		`- Swift_SDKROOT = (Get-SwiftSDK $Platform.OS -Identifier "$($Platform.OS)Experimental");`
`2422`		`- SwiftCore_ARCH_SUBDIR = $Platform.Architecture.LLVMName;`
	`2419`	`+ SwiftCore_DIR = "$(Get-ProjectBinaryCache $Platform ExperimentalRuntime)\cmake\SwiftCore";`
`2423`	`2420`	`}`
`2424`	`2421`	`}`
`2425`	`2422`	`}`