Merge remote-tracking branch 'upstream/main' into HEAD

thebrowsercompany · Oct 19, 2023 · 2a20834 · 2a20834
2 parents 3e64121 + e327320
commit 2a20834
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/.azure/vs2022.yml b/.azure/vs2022.yml
@@ -2067,6 +2067,8 @@ stages:
                 -p:ProductVersion=${{ parameters.ProductVersion }}${{ parameters.BuildTag }}
                 -p:CERTIFICATE=$(certificate.secureFilePath)
                 -p:PASSPHRASE=$(CERTIFICATE_PASSWORD)
+                -p:VCRedistInstaller="${env:VCToolsRedistDir}\vc_redist.${env:VSCMD_ARG_TGT_ARCH}.exe"
+                -p:VSVersion=${env:VSCMD_VER}
                 -p:INCLUDE_AMD64_SDK=true
                 -p:INCLUDE_X86_SDK=true
                 -p:INCLUDE_ARM64_SDK=true

diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml
@@ -1971,6 +1971,8 @@ jobs:
               -p:CERTIFICATE=${env:CERTIFICATE} `
               -p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
               -p:BundleFlavor=offline `
+              -p:VCRedistInstaller="${env:VCToolsRedistDir}\vc_redist.${env:VSCMD_ARG_TGT_ARCH}.exe" `
+              -p:VSVersion=${env:VSCMD_VER} `
               -p:INCLUDE_AMD64_SDK=true `
               -p:INCLUDE_X86_SDK=true `
               -p:INCLUDE_ARM64_SDK=true `

diff --git a/build.ps1 b/build.ps1
@@ -848,6 +848,7 @@ function Build-Compilers($Arch, [switch]$Test = $false) {
         LLVM_TABLEGEN = "$BinaryCache\0\bin\llvm-tblgen.exe";
         LLVM_USE_HOST_TOOLS = "NO";
         SWIFT_BUILD_SWIFT_SYNTAX = "YES";
+        SWIFT_CLANG_LOCATION = "$BinaryCache\toolchains\$PinnedToolchain\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin";
         SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY = "YES";
         SWIFT_ENABLE_EXPERIMENTAL_CXX_INTEROP = "YES";
         SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING = "YES";
@@ -1484,6 +1485,7 @@ function Build-SourceKitLSP($Arch) {
       TSC_DIR = "$BinaryCache\3\cmake\modules";
       LLBuild_DIR = "$BinaryCache\4\cmake\modules";
       ArgumentParser_DIR = "$BinaryCache\6\cmake\modules";
+      SwiftCrypto_DIR = "$BinaryCache\8\cmake\modules";
       SwiftCollections_DIR = "$BinaryCache\9\cmake\modules";
       SwiftPM_DIR = "$BinaryCache\12\cmake\modules";
       IndexStoreDB_DIR = "$BinaryCache\13\cmake\modules";
@@ -1560,6 +1562,15 @@ function Build-Installer() {
     SWIFT_DOCC_RENDER_ARTIFACT_ROOT = "${SourceCache}\swift-docc-render-artifact";
   }
 
+  Isolate-EnvVars {
+    Invoke-VsDevShell $HostArch
+    $VCRedistInstallerPath = "${env:VCToolsRedistDir}\vc_redist.$($HostArch.ShortName).exe"
+    if (Test-Path $VCRedistInstallerPath) {
+      $Properties["VCRedistInstaller"] = $VCRedistInstallerPath
+      $Properties["VSVersion"] = $env:VSCMD_VER
+    }
+  }
+
   foreach ($Arch in $SDKArchs) {
     $Properties["INCLUDE_$($Arch.VSName.ToUpperInvariant())_SDK"] = "true"
     $Properties["PLATFORM_ROOT_$($Arch.VSName.ToUpperInvariant())"] = "$($Arch.PlatformInstallRoot)\"