Skip to content

Commit 2839adc

Browse files
committed
util: Relax conditions on defining _ALLOW_COMPILER_AND_STL_VERSION_MISMATCH.
1 parent 725bd91 commit 2839adc

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

utils/build.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,11 +1640,11 @@ function Build-Compilers() {
16401640
$PythonRoot = "$BinaryCache\Python$($Arch.CMakeName)-$PythonVersion\tools"
16411641
$PythonLibName = "python{0}{1}" -f ([System.Version]$PythonVersion).Major, ([System.Version]$PythonVersion).Minor
16421642

1643-
# The STL in VS 17.10 requires Clang 17 or higher, but Swift toolchains prior to version 6 include older versions
1644-
# of Clang. If bootstrapping with an older toolchain, we need to relax to relax this requirement with
1645-
# ALLOW_COMPILER_AND_STL_VERSION_MISMATCH.
1643+
# The STL in VS 17.10 requires Clang 17 or higher, but released Swift toolchains currently include older versions
1644+
# of Clang. If bootstrapping with an older toolchain, we need to relax this requirement by defining
1645+
# _ALLOW_COMPILER_AND_STL_VERSION_MISMATCH. Developer builds are (currently) up-to-date.
16461646
$SwiftFlags = @();
1647-
if ([System.Version](Get-PinnedToolchainVersion) -lt [System.Version]"6.0" -and [System.Version](Get-PinnedToolchainVersion) -ne [System.Version]"0.0.0") {
1647+
if ([System.Version](Get-PinnedToolchainVersion) -ne [System.Version]"0.0.0") {
16481648
$SwiftFlags += @("-Xcc", "-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH");
16491649
}
16501650

0 commit comments

Comments
 (0)