Skip to content

Commit a56fd9d

Browse files
compnerdcompnerd
committed
GHA: correct ternary to avoid passing -fuse-ld=lld
This flag is not supported by MSVC, ensuire that we do not improperly pass this to the flags. This is a u-opt to ensure that we do not need to see the output and avoid the unnecessary processing for the invalid argument.
1 parent 7816ea2 commit a56fd9d

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎.github/workflows/swift-toolchain.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ jobs:
360360
cmake-defines: |
361361
@{
362362
'BUILD_SHARED_LIBS' = "NO";
363-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
363+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
364364
}
365365
- name: Build SQLite
366366
run: cmake --build ${{ github.workspace }}/BinaryCache/sqlite-${{ inputs.swift_toolchain_sqlite_version }}
@@ -446,8 +446,8 @@ jobs:
446446
cache-script: ${{ github.workspace }}/SourceCache/ds2/cmake/caches/MSVCWarnings.cmake
447447
cmake-defines: |
448448
@{
449-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
450-
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
449+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
450+
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
451451
}
452452
- name: Build RegsGen2
453453
if: inputs.build_android
@@ -652,8 +652,8 @@ jobs:
652652
'BUILD_SHARED_LIBS' = "YES";
653653
'BUILD_TESTING' = "NO";
654654
'CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP' = "YES";
655-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
656-
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
655+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
656+
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
657657
}
658658
- name: Build cmark-gfm
659659
run: cmake --build ${{ github.workspace }}/BinaryCache/cmark-gfm-${{ inputs.swift_cmark_version }}
@@ -772,8 +772,8 @@ jobs:
772772
'SWIFT_INCLUDE_DOCS' = "NO";
773773
'SWIFT_INCLUDE_TESTS' = "NO";
774774
'cmark-gfm_DIR' = "${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/cmake";
775-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
776-
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
775+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
776+
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
777777
}
778778
- name: Build llvm-tblgen
779779
run: cmake --build ${{ github.workspace }}/BinaryCache/0 --target llvm-tblgen
@@ -1160,9 +1160,9 @@ jobs:
11601160
'LLVM_VERSION_SUFFIX' = "";
11611161
'LLVM_PARALLEL_LINK_JOBS' = "${{ steps.setup-context.outputs.link-jobs }}";
11621162
'SWIFT_PARALLEL_LINK_JOBS' = "${{ steps.setup-context.outputs.link-jobs }}";
1163-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
1164-
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
1165-
'CMAKE_Swift_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-use-ld=lld' }}";
1163+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
1164+
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
1165+
'CMAKE_Swift_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-use-ld=lld' }}";
11661166
}
11671167
11681168
- name: Build Compiler Distribution
@@ -1337,7 +1337,7 @@ jobs:
13371337
@{
13381338
'BUILD_SHARED_LIBS' = "NO";
13391339
'CMAKE_POSITION_INDEPENDENT_CODE' = "YES";
1340-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
1340+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
13411341
}
13421342
- name: Build zlib
13431343
run: cmake --build ${{ github.workspace }}/BinaryCache/zlib-${{ inputs.zlib_version }}
@@ -1427,7 +1427,7 @@ jobs:
14271427
@{
14281428
'BUILD_SHARED_LIBS' = "NO";
14291429
'CMAKE_POSITION_INDEPENDENT_CODE' = "YES";
1430-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
1430+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
14311431
}
14321432
- name: Build brotli
14331433
run: cmake --build ${{ github.workspace }}/BinaryCache/brotli-${{ inputs.brotli_version }}
@@ -1616,7 +1616,7 @@ jobs:
16161616
'BROTLI_INCLUDE_DIR' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/include";
16171617
'BROTLICOMMON_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/lib/$(if ("${{ matrix.os }}" -eq "Windows") { "brotlicommon.lib" } else { "libbrotlicommon.a" })";
16181618
'BROTLIDEC_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/lib/$(if ("${{ matrix.os }}" -eq "Windows") { "brotlidec.lib" } else { "libbrotlidec.a" })";
1619-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
1619+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
16201620
}
16211621
- name: Build curl
16221622
run: cmake --build ${{ github.workspace }}/BinaryCache/curl-${{ inputs.curl_version }}
@@ -1713,8 +1713,8 @@ jobs:
17131713
'LIBXML2_WITH_TESTS' = "NO";
17141714
'LIBXML2_WITH_THREADS' = "YES";
17151715
'LIBXML2_WITH_ZLIB' = "NO";
1716-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
1717-
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
1716+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
1717+
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
17181718
}
17191719
- name: Build libxml2
17201720
run: cmake --build ${{ github.workspace }}/BinaryCache/libxml2-${{ inputs.libxml2_version }}
@@ -1841,8 +1841,8 @@ jobs:
18411841
@{
18421842
'LLVM_ENABLE_ASSERTIONS' = "YES";
18431843
'LLVM_HOST_TRIPLE' = "${{ matrix.triple }}";
1844-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
1845-
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
1844+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
1845+
'CMAKE_CXX_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
18461846
}
18471847
18481848
- name: Configure Swift Standard Library
@@ -3769,7 +3769,7 @@ jobs:
37693769
'SwiftMarkdown_DIR' = "${{ github.workspace }}/BinaryCache/swift-markdown/cmake/modules";
37703770
'SwiftSyntax_DIR' = "${{ github.workspace }}/BinaryCache/swift-syntax/cmake/modules";
37713771
'cmark-gfm_DIR' = "${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/cmake";
3772-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
3772+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
37733773
}
37743774
- name: Build swift-format
37753775
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-format
@@ -3792,7 +3792,7 @@ jobs:
37923792
pinned-compilers: ${{ inputs.use_host_toolchain && '@()' || '@("C")' }}
37933793
cmake-defines: |
37943794
@{
3795-
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
3795+
'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && ' ' || '-fuse-ld=lld' }}";
37963796
}
37973797
- name: Build swift-lmdb
37983798
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-lmdb

0 commit comments

Comments
 (0)