Merge pull request #76712 from compnerd/mismatch

compnerd · web-flow · commit 018ef6e6c061 · 2024-09-26T08:13:21.000-07:00
utils: do not allow the compiler mismatch for the STL
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1421,7 +1421,7 @@ function Build-Compilers() {
     # of Clang. If bootstrapping with an older toolchain, we need to relax to relax this requirement with
     # ALLOW_COMPILER_AND_STL_VERSION_MISMATCH.
     $SwiftFlags = @();
-    if ([System.Version](Get-PinnedToolchainVersion) -lt [System.Version]"6.0") {
+    if ([System.Version](Get-PinnedToolchainVersion) -lt [System.Version]"6.0" -and [System.Version](Get-PinnedToolchainVersion) -ne [System.Version]"0.0.0") {
       $SwiftFlags += @("-Xcc", "-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1421,7 +1421,7 @@ function Build-Compilers() {`
`1421`	`1421`	`# of Clang. If bootstrapping with an older toolchain, we need to relax to relax this requirement with`
`1422`	`1422`	`# ALLOW_COMPILER_AND_STL_VERSION_MISMATCH.`
`1423`	`1423`	`$SwiftFlags = @();`
`1424`		`- if ([System.Version](Get-PinnedToolchainVersion) -lt [System.Version]"6.0") {`
	`1424`	`+ if ([System.Version](Get-PinnedToolchainVersion) -lt [System.Version]"6.0" -and [System.Version](Get-PinnedToolchainVersion) -ne [System.Version]"0.0.0") {`
`1425`	`1425`	`$SwiftFlags += @("-Xcc", "-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH");`
`1426`	`1426`	`}`
`1427`	`1427`