Skip to content

Commit b28e574

Browse files
z2ohcompnerd
authored andcommitted
Pass -Xcc -D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH to CMAKE_Swift_FLAGS
VS 17.10 introduced a requirement on Clang 17, but the pinned Swift toolchain used to bootstrap the compilers (a 5.10 snapshot) uses Clang 16. We can relax this version requirement with ALLOW_COMPILER_AND_STL_VERSION_MISMATCH which needs to be passed via CMAKE_Swift_FLAGS when configuring the compilers
1 parent a6dbb7f commit b28e574

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ jobs:
741741
-D CMAKE_MT=mt `
742742
-D CMAKE_Swift_COMPILER="${SWIFTC}" `
743743
-D CMAKE_Swift_COMPILER_WORKS=YES `
744-
-D CMAKE_Swift_FLAGS="-sdk `"${SDKROOT}`"" `
744+
-D CMAKE_Swift_FLAGS="-sdk `"${SDKROOT}`" -Xcc -D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH" `
745745
-D CMAKE_EXE_LINKER_FLAGS="${{ needs.context.outputs.CMAKE_EXE_LINKER_FLAGS }}" `
746746
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
747747
-D CMAKE_SHARED_LINKER_FLAGS="${{ needs.context.outputs.CMAKE_SHARED_LINKER_FLAGS }}" `

0 commit comments

Comments
 (0)