From 33d73ce0c5242361ebf9d283aced4b33d7fac855 Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <steelskin@gmail.com>
Date: Fri, 29 Aug 2025 11:36:38 -0700
Subject: [PATCH] util: Install foundation libraries in arch subdir

---
 utils/build.ps1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/build.ps1 b/utils/build.ps1
index 45793f83e7516..3cdfb72d7caf3 100644
--- a/utils/build.ps1
+++ b/utils/build.ps1
@@ -2967,6 +2967,7 @@ function Build-Foundation {
       CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
       CMAKE_Swift_FLAGS = $SwiftFlags;
       FOUNDATION_BUILD_TOOLS = if ($Platform.OS -eq [OS]::Windows) { "YES" } else { "NO" };
+      SwiftFoundation_INSTALL_ARCH_SUBDIR = "YES";
       CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
       LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
       ZLIB_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
@@ -3216,8 +3217,8 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
       CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";
       CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
       ENABLE_TESTING = "NO";
-
       FOUNDATION_BUILD_TOOLS = "NO";
+      SwiftFoundation_INSTALL_ARCH_SUBDIR = "YES";
       CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
       LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
       ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
@@ -3248,8 +3249,8 @@ function Build-ExperimentalSDK([Hashtable] $Platform) {
       CMAKE_Swift_FLAGS = @("-static-stdlib", "-Xfrontend", "-use-static-resource-dir");
       CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
       ENABLE_TESTING = "NO";
-
       FOUNDATION_BUILD_TOOLS = if ($Platform.OS -eq [OS]::Windows) { "YES" } else { "NO" };
+      SwiftFoundation_INSTALL_ARCH_SUBDIR = "YES";
       CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
       LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
       ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";