Skip to content

Commit 2c9a8a7

Browse files
committed
Fix build as per swiftlang/swift#69707
1 parent e64d412 commit 2c9a8a7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ jobs:
11901190
-D CMAKE_SHARED_LINKER_FLAGS="${{ needs.context.outputs.CMAKE_SHARED_LINKER_FLAGS }}" `
11911191
-D CMAKE_SWIFT_COMPILER=${SWIFTC} `
11921192
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
1193-
-D CMAKE_Swift_FLAGS="-resource-dir ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift -L${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows -vfsoverlay ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml ${{ needs.context.outputs.CMAKE_Swift_FLAGS }}" `
1193+
-D CMAKE_Swift_FLAGS="-resource-dir ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift -L${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows -vfsoverlay ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml -strict-implicit-module-context -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules ${{ needs.context.outputs.CMAKE_Swift_FLAGS }}" `
11941194
-D CMAKE_Swift_FLAGS_RELEASE="-O" `
11951195
-D CMAKE_SYSTEM_NAME=Windows `
11961196
-D CMAKE_SYSTEM_PROCESSOR=${{ matrix.cpu }} `
@@ -1227,7 +1227,7 @@ jobs:
12271227
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr `
12281228
-D CMAKE_Swift_COMPILER=${SWIFTC} `
12291229
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
1230-
-D CMAKE_Swift_FLAGS="-resource-dir ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift -L${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows -vfsoverlay ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml ${{ needs.context.outputs.CMAKE_Swift_FLAGS }}" `
1230+
-D CMAKE_Swift_FLAGS="-resource-dir ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift -L${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows -vfsoverlay ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml -strict-implicit-module-context -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules ${{ needs.context.outputs.CMAKE_Swift_FLAGS }}" `
12311231
-D CMAKE_Swift_FLAGS_RELEASE="-O" `
12321232
-D CMAKE_SYSTEM_NAME=Windows `
12331233
-D CMAKE_SYSTEM_PROCESSOR=${{ matrix.cpu }} `
@@ -1273,7 +1273,7 @@ jobs:
12731273
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/Library/XCTest-development/usr `
12741274
-D CMAKE_Swift_COMPILER=${SWIFTC} `
12751275
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
1276-
-D CMAKE_Swift_FLAGS="-resource-dir ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift -L${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows -vfsoverlay ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml ${{ needs.context.outputs.CMAKE_Swift_FLAGS }}" `
1276+
-D CMAKE_Swift_FLAGS="-resource-dir ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift -L${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/lib/swift/windows -vfsoverlay ${{ github.workspace }}/BinaryCache/swift/stdlib/windows-vfs-overlay.yaml -strict-implicit-module-context -Xcc -Xclang -Xcc -fbuiltin-headers-in-system-modules ${{ needs.context.outputs.CMAKE_Swift_FLAGS }}" `
12771277
-D CMAKE_Swift_FLAGS_RELEASE="-O" `
12781278
-D CMAKE_SYSTEM_NAME=Windows `
12791279
-D CMAKE_SYSTEM_PROCESSOR=${{ matrix.cpu }} `

0 commit comments

Comments
 (0)