Skip to content

Commit 9210338

Browse files
committed
GHA: specify Swift compile target, C++ compiler, install location
Add missing flags for swift-testing configuration. This is primarily the C++ compiler, target triple, and the install location.
1 parent 4ca63bb commit 9210338

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2126,7 +2126,12 @@ jobs:
21262126
-D BUILD_SHARED_LIBS=YES `
21272127
-D CMAKE_BUILD_TYPE=Release `
21282128
-D CMAKE_BUILD_WITH_INSTALL_RPATH=YES `
2129+
-D CMAKE_CXX_COMPILER=${{ matrix.cxx }} `
2130+
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
2131+
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
2132+
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/Library/Testing-development/usr `
21292133
-D CMAKE_Swift_COMPILER=${SWIFTC} `
2134+
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple_no_api_level }} `
21302135
-D CMAKE_Swift_FLAGS="-resource-dir ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr/lib/swift -L${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr/lib/swift/${{ matrix.os }} ${OVERLAY_FLAGS} ${{ matrix.swiftflags }}" `
21312136
-D CMAKE_Swift_FLAGS_RELEASE="-O" `
21322137
-D CMAKE_SYSTEM_NAME=${{ matrix.os }} `

0 commit comments

Comments
 (0)