Skip to content

Commit 1469957

Browse files
committed
utils: update toolchain snapshot to permit use of the experimental SDK
Use the experimental SDK to build the toolchain and consume the redistributable. This is going to ensure that we build the entire toolchain against a stable point and run against the runtime that we build against.
1 parent a134e44 commit 1469957

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

utils/build.ps1

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,14 +269,14 @@ if ($UseHostToolchain -is [string]) {
269269

270270
$DefaultPinned = @{
271271
AMD64 = @{
272-
PinnedBuild = "https://download.swift.org/swift-6.1.2-release/windows10/swift-6.1.2-RELEASE/swift-6.1.2-RELEASE-windows10.exe";
273-
PinnedSHA256 = "92A0323ED7DD333C3B05E6E0E428F3A91C77D159F6CCFC8626A996F2ACE09A0B";
274-
PinnedVersion = "6.1.2";
272+
PinnedBuild = "https://ci-external.swift.org/job/swift-main-windows-toolchain/1720/artifact/build/artifacts/installer.exe";
273+
PinnedSHA256 = "1D8837A7421BABC9BC548304CF19254FA179404ED2BDD6F2C0E097F7E2186866";
274+
PinnedVersion = "0.0.0";
275275
};
276276
ARM64 = @{
277-
PinnedBuild = "https://download.swift.org/swift-6.1.2-release/windows10-arm64/swift-6.1.2-RELEASE/swift-6.1.2-RELEASE-windows10-arm64.exe";
278-
PinnedSHA256 = "121FB407E578178F82DCCF39A4D03527873D8F7611A801A8FC26DA52503A0C5C";
279-
PinnedVersion = "6.1.2";
277+
PinnedBuild = ""
278+
PinnedSHA256 = "";
279+
PinnedVersion = "0.0.0";
280280
};
281281
}
282282

@@ -2206,6 +2206,7 @@ function Get-CompilersDefines([Hashtable] $Platform, [string] $Variant, [switch]
22062206
return $TestDefines + $DebugDefines + @{
22072207
CLANG_TABLEGEN = (Join-Path -Path $BuildTools -ChildPath "clang-tblgen.exe");
22082208
CLANG_TIDY_CONFUSABLE_CHARS_GEN = (Join-Path -Path $BuildTools -ChildPath "clang-tidy-confusable-chars-gen.exe");
2209+
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
22092210
CMAKE_Swift_FLAGS = $SwiftFlags;
22102211
LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
22112212
LLDB_LIBXML2_VERSION = "2.11.5";

0 commit comments

Comments
 (0)