Skip to content

Commit 648af5e

Browse files
committed
[build-script] Pass Swift_DIR to standalone LLDB build
Upstream we changed the LLDB standalone build to use LLVM_DIR and Clang_DIR to find LLVM and Clang respectively. This commit does the same for Swift, making everything use Swift_DIR instead of our hand-rolled variables. (cherry picked from commit 0f3f54c)
1 parent f221594 commit 648af5e

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

utils/build-script-impl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2472,11 +2472,10 @@ for host in "${ALL_HOSTS[@]}"; do
24722472
-DLLDB_SWIFTC:PATH="$(build_directory ${LOCAL_HOST} swift)/bin/swiftc"
24732473
-DLLDB_SWIFT_LIBS:PATH="$(build_directory ${LOCAL_HOST} swift)/lib/swift"
24742474
-DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})"
2475-
-DClang_DIR:PATH=${llvm_build_dir}/lib/cmake/clang
24762475
-DLLVM_DIR:PATH=${llvm_build_dir}/lib/cmake/llvm
2477-
-DLLDB_PATH_TO_CLANG_BUILD:PATH="${llvm_build_dir}"
2476+
-DClang_DIR:PATH=${llvm_build_dir}/lib/cmake/clang
2477+
-DSwift_DIR:PATH=${swift_build_dir}/lib/cmake/swift
24782478
-DLLDB_PATH_TO_SWIFT_SOURCE:PATH="${SWIFT_SOURCE_DIR}"
2479-
-DLLDB_PATH_TO_SWIFT_BUILD:PATH="${swift_build_dir}"
24802479
-DLLDB_IS_BUILDBOT_BUILD:BOOL="${LLDB_IS_BUILDBOT_BUILD}"
24812480
-DLLDB_BUILD_DATE:STRING="\"${LLDB_BUILD_DATE}\""
24822481
-DLLDB_ALLOW_STATIC_BINDINGS:BOOL=1

0 commit comments

Comments
 (0)