@@ -689,6 +689,7 @@ jobs:
689689
690690 - name : Configure Tools
691691 run : |
692+ $LLVM_EXTERNAL_SWIFT_SOURCE_DIR = cygpath -m ${{ github.workspace }}/SourceCache/swift
692693 cmake -B ${{ github.workspace }}/BinaryCache/0 `
693694 -D CMAKE_BUILD_TYPE=Release `
694695 -D CMAKE_C_COMPILER=${{ matrix.cc }} `
@@ -706,7 +707,7 @@ jobs:
706707 -D LLVM_ENABLE_LIBXML2=NO `
707708 -D LLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lldb" `
708709 -D LLVM_EXTERNAL_PROJECTS="swift" `
709- -D LLVM_EXTERNAL_SWIFT_SOURCE_DIR=${{ github.workspace }}/SourceCache/swift `
710+ -D LLVM_EXTERNAL_SWIFT_SOURCE_DIR=$LLVM_EXTERNAL_SWIFT_SOURCE_DIR `
710711 -D LLDB_ENABLE_PYTHON=NO `
711712 -D LLDB_INCLUDE_TESTS=NO `
712713 -D LLDB_ENABLE_SWIFT_SUPPORT=NO `
@@ -1094,6 +1095,8 @@ jobs:
10941095 $ExeSuffix = ""
10951096 }
10961097
1098+ $LLVM_EXTERNAL_SWIFT_SOURCE_DIR = cygpath -m ${{ github.workspace }}/SourceCache/swift
1099+
10971100 cmake -B ${{ github.workspace }}/BinaryCache/1 `
10981101 -C "${{ github.workspace }}/SourceCache/swift/cmake/caches/${{ matrix.os }}-${{ matrix.cpu }}.cmake" `
10991102 -D CMAKE_BUILD_TYPE=Release `
@@ -1119,7 +1122,7 @@ jobs:
11191122 -D LLDB_TABLEGEN="${{ github.workspace }}/BinaryCache/0/bin/lldb-tblgen${ExeSuffix}" `
11201123 -D LLVM_CONFIG_PATH="${{ github.workspace }}/BinaryCache/0/bin/llvm-config${ExeSuffix}" `
11211124 -D LLVM_ENABLE_ASSERTIONS=${{ matrix.variant == 'Asserts' && 'YES' || 'NO' }} `
1122- -D LLVM_EXTERNAL_SWIFT_SOURCE_DIR=${{ github.workspace }}/SourceCache/swift `
1125+ -D LLVM_EXTERNAL_SWIFT_SOURCE_DIR=$LLVM_EXTERNAL_SWIFT_SOURCE_DIR `
11231126 -D LLVM_NATIVE_TOOL_DIR=${{ github.workspace }}/BinaryCache/0/bin `
11241127 -D LLVM_TABLEGEN="${{ github.workspace }}/BinaryCache/0/bin/llvm-tblgen${ExeSuffix}" `
11251128 -D LLVM_USE_HOST_TOOLS=NO `
0 commit comments