Skip to content

Commit db9ed8f

Browse files
[gha] fix the Windows Swift toolchain build (#899)
* GHA: tweak the library naming for static libraries This was changed upstream to use `lib` prefix for static libraries on Windows for Swift. Apply the necessary build changes to ensure that the build system is aware of this. * include cmake_linker_flags when building Windows tools * remove extra CMAKE_STATIC_LIBRARY_PREFIX_Swift --------- Co-authored-by: Hiroshi Yamauchi <[email protected]>
1 parent a511f46 commit db9ed8f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1079,11 +1079,11 @@ jobs:
10791079
-D CMAKE_CXX_COMPILER="${{ steps.setup-context.outputs.cxx }}" `
10801080
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache `
10811081
-D CMAKE_CXX_FLAGS="${{ steps.setup-context.outputs.cxxflags }}" `
1082-
-D CMAKE_STATIC_LIBRARY_PREFIX_Swift= `
10831082
-D CMAKE_Swift_COMPILER="${{ steps.setup-context.outputs.swiftc }}" `
10841083
-D CMAKE_Swift_COMPILER_WORKS=YES `
10851084
-D CMAKE_Swift_FLAGS="${{ steps.setup-context.outputs.swiftflags }}" `
10861085
${{ matrix.cmake_linker_flags }} `
1086+
-D CMAKE_STATIC_LIBRARY_PREFIX_Swift= `
10871087
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=YES `
10881088
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
10891089
${{ steps.setup-context.outputs.extra_flags }} `
@@ -2982,6 +2982,7 @@ jobs:
29822982
-D CMAKE_Swift_FLAGS_RELEASE="-O" `
29832983
${{ matrix.cmake_linker_flags }} `
29842984
-D CMAKE_SYSTEM_NAME=Windows `
2985+
${{ matrix.cmake_linker_flags }} `
29852986
-D CMAKE_SYSTEM_PROCESSOR=${{ matrix.cpu }} `
29862987
-G Ninja `
29872988
-S ${{ github.workspace }}/SourceCache/swift-certificates `
@@ -3167,6 +3168,7 @@ jobs:
31673168
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
31683169
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
31693170
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
3171+
${{ matrix.cmake_linker_flags }} `
31703172
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
31713173
-D CMAKE_Swift_COMPILER=${SWIFTC} `
31723174
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `

0 commit comments

Comments
 (0)