Skip to content

Commit 93fad08

Browse files
committed
Use paths directly for toolchain build tools
1 parent cee6e49 commit 93fad08

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,11 +1014,6 @@ jobs:
10141014
}
10151015
10161016
$SwiftFlags += " -sdk `"${SDKROOT}`""
1017-
$CLANG_TBLGEN = "${{ github.workspace }}/BinaryCache/0/bin/clang-tblgen${ExeSuffix}"
1018-
$CLANG_TIDY_CONFUSABLE_CHARS_GEN = "${{ github.workspace }}/BinaryCache/0/bin/clang-tidy-confusable-chars-gen${ExeSuffix}"
1019-
$LLDB_TBLGEN = "${{ github.workspace }}/BinaryCache/0/bin/lldb-tblgen${ExeSuffix}"
1020-
$LLVM_CONFIG = "${{ github.workspace }}/BinaryCache/0/bin/llvm-config${ExeSuffix}"
1021-
$LLVM_TBLGEN = "${{ github.workspace }}/BinaryCache/0/bin/llvm-tblgen${ExeSuffix}"
10221017
10231018
cmake -B ${{ github.workspace }}/BinaryCache/1 `
10241019
-C "${CACHE}" `
@@ -1037,13 +1032,13 @@ jobs:
10371032
@EXTRA_FLAGS `
10381033
-G Ninja `
10391034
-S ${{ github.workspace }}/SourceCache/llvm-project/llvm `
1040-
-D CLANG_TABLEGEN="${CLANG_TBLGEN}" `
1041-
-D CLANG_TIDY_CONFUSABLE_CHARS_GEN="${CLANG_TIDY_CONFUSABLE_CHARS_GEN}" `
1042-
-D LLDB_TABLEGEN="${LLDB_TBLGEN}" `
1043-
-D LLVM_CONFIG_PATH="${LLVM_CONFIG}" `
1035+
-D CLANG_TABLEGEN="${{ github.workspace }}/BinaryCache/0/bin/clang-tblgen${ExeSuffix}" `
1036+
-D CLANG_TIDY_CONFUSABLE_CHARS_GEN="${{ github.workspace }}/BinaryCache/0/bin/clang-tidy-confusable-chars-gen${ExeSuffix}" `
1037+
-D LLDB_TABLEGEN="${{ github.workspace }}/BinaryCache/0/bin/lldb-tblgen${ExeSuffix}" `
1038+
-D LLVM_CONFIG_PATH="${{ github.workspace }}/BinaryCache/0/bin/llvm-config${ExeSuffix}" `
10441039
-D LLVM_EXTERNAL_SWIFT_SOURCE_DIR=${{ github.workspace }}/SourceCache/swift `
10451040
-D LLVM_NATIVE_TOOL_DIR=${{ github.workspace }}/BinaryCache/0/bin `
1046-
-D LLVM_TABLEGEN="${LLVM_TBLGEN}" `
1041+
-D LLVM_TABLEGEN="${{ github.workspace }}/BinaryCache/0/bin/llvm-tblgen${ExeSuffix}" `
10471042
-D LLVM_USE_HOST_TOOLS=NO `
10481043
-D SWIFT_BUILD_DYNAMIC_SDK_OVERLAY=NO `
10491044
-D SWIFT_BUILD_DYNAMIC_STDLIB=NO `

0 commit comments

Comments
 (0)