Skip to content

Commit 78218b0

Browse files
committed
build-script: support CMake install steps.
Currently, bots that perfrom an installation will build LLDB once using CMake because that is the default and then again using Xcode because the CMake install step is not implemented by build-script. This patch adds CMake support by calling the generic cmake install-lldb step. <rdar://problem/51317901>
1 parent d543dd9 commit 78218b0

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

utils/build-script-impl

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3537,24 +3537,27 @@ for host in "${ALL_HOSTS[@]}"; do
35373537
echo "--install-destdir is required to install products."
35383538
exit 1
35393539
fi
3540-
3541-
case ${host} in
3542-
linux-*)
3540+
if [[ "$using_xcodebuild" == "TRUE" ]] ; then
3541+
case ${host} in
3542+
linux-*)
35433543
;;
3544-
freebsd-*)
3544+
freebsd-*)
35453545
;;
3546-
cygwin-*)
3546+
cygwin-*)
35473547
;;
3548-
haiku-*)
3548+
haiku-*)
35493549
;;
3550-
macosx-*)
3551-
set_lldb_xcodebuild_options
3552-
set_lldb_build_mode
3553-
with_pushd ${LLDB_SOURCE_DIR} \
3554-
call xcodebuild -target toolchain -configuration ${LLDB_BUILD_MODE} install ${lldb_xcodebuild_options[@]} DSTROOT="${host_install_destdir}" LLDB_TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}"
3555-
continue
3550+
macosx-*)
3551+
set_lldb_xcodebuild_options
3552+
set_lldb_build_mode
3553+
with_pushd ${LLDB_SOURCE_DIR} \
3554+
call xcodebuild -target toolchain -configuration ${LLDB_BUILD_MODE} install ${lldb_xcodebuild_options[@]} DSTROOT="${host_install_destdir}" LLDB_TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}"
3555+
continue
35563556
;;
3557-
esac
3557+
esac
3558+
else
3559+
INSTALL_TARGETS="install-lldb"
3560+
fi
35583561
;;
35593562
swiftpm)
35603563
if [[ -z "${INSTALL_SWIFTPM}" ]] ; then

0 commit comments

Comments
 (0)