Skip to content

Commit 52a1ea0

Browse files
Merge pull request swiftlang#25931 from weliveindetail/master-with-lldb-upstream-cmake
[CMake] Use CMake caches for lldb in build-script; allows PR #1765 in swift-lldb
2 parents abc9b19 + 7d58b05 commit 52a1ea0

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

utils/build-script-impl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,8 +2530,15 @@ for host in "${ALL_HOSTS[@]}"; do
25302530
call xcodebuild -target desktop -configuration ${LLDB_BUILD_MODE} ${lldb_xcodebuild_options[@]}
25312531
continue
25322532
else
2533+
if [[ "$(uname -s)" == "Darwin" ]] ; then
2534+
cmake_cache="Apple-lldb-macOS.cmake"
2535+
else
2536+
cmake_cache="Apple-lldb-linux.cmake"
2537+
fi
2538+
25332539
cmake_options=(
25342540
"${cmake_options[@]}"
2541+
-C${LLDB_SOURCE_DIR}/cmake/caches/${cmake_cache}
25352542
-DCMAKE_BUILD_TYPE:STRING="${LLDB_BUILD_TYPE}"
25362543
-DLLDB_SWIFTC:PATH="$(build_directory ${LOCAL_HOST} swift)/bin/swiftc"
25372544
-DLLDB_SWIFT_LIBS:PATH="$(build_directory ${LOCAL_HOST} swift)/lib/swift"
@@ -2549,10 +2556,8 @@ for host in "${ALL_HOSTS[@]}"; do
25492556

25502557
if [[ "$(uname -s)" == "Darwin" ]] ; then
25512558
cmake_options+=(
2552-
-DLLDB_BUILD_FRAMEWORK:BOOL=TRUE
25532559
-DLLDB_CODESIGN_IDENTITY=""
25542560
-DLLDB_USE_SYSTEM_DEBUGSERVER:BOOL="${LLDB_USE_SYSTEM_DEBUGSERVER}"
2555-
-DLLDB_FRAMEWORK_TOOLS="darwin-debug;lldb-argdumper;lldb-server;repl_swift"
25562561
)
25572562
fi
25582563
fi

0 commit comments

Comments
 (0)