Merge pull request #80039 from compnerd/crossed

compnerd · web-flow · commit 2f60c73ad6e2 · 2025-03-16T15:04:47.000-07:00
utils: explicitly cross-compile the experimental runtimes
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -2261,7 +2261,10 @@ function Build-ExperimentalRuntime {
       -Defines @{
         BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };
         CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";
+        CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Arch);
+        CMAKE_Swift_COMPILER_WORKS = "YES";
         CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
+        CMAKE_SYSTEM_NAME = $Platform.ToString();
         dispatch_DIR = "$(Get-TargetProjectBinaryCache $Arch Dispatch)\cmake\modules";
       }
   }

Original file line number	Diff line number	Diff line change
`@@ -2261,7 +2261,10 @@ function Build-ExperimentalRuntime {`
`2261`	`2261`	`-Defines @{`
`2262`	`2262`	`BUILD_SHARED_LIBS = if ($Static) { "NO" } else { "YES" };`
`2263`	`2263`	`CMAKE_FIND_PACKAGE_PREFER_CONFIG = "YES";`
	`2264`	`+ CMAKE_Swift_COMPILER_TARGET = (Get-ModuleTriple $Arch);`
	`2265`	`+ CMAKE_Swift_COMPILER_WORKS = "YES";`
`2264`	`2266`	`CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";`
	`2267`	`+ CMAKE_SYSTEM_NAME = $Platform.ToString();`
`2265`	`2268`	`dispatch_DIR = "$(Get-TargetProjectBinaryCache $Arch Dispatch)\cmake\modules";`
`2266`	`2269`	`}`
`2267`	`2270`	`}`