Skip to content

Commit 529e7fd

Browse files
adrian-prantljasonmolenda
authored andcommitted
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> (cherry picked from commit 78218b0)
1 parent b368b0d commit 529e7fd

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
@@ -3538,24 +3538,27 @@ for host in "${ALL_HOSTS[@]}"; do
35383538
echo "--install-destdir is required to install products."
35393539
exit 1
35403540
fi
3541-
3542-
case ${host} in
3543-
linux-*)
3541+
if [[ "$using_xcodebuild" == "TRUE" ]] ; then
3542+
case ${host} in
3543+
linux-*)
35443544
;;
3545-
freebsd-*)
3545+
freebsd-*)
35463546
;;
3547-
cygwin-*)
3547+
cygwin-*)
35483548
;;
3549-
haiku-*)
3549+
haiku-*)
35503550
;;
3551-
macosx-*)
3552-
set_lldb_xcodebuild_options
3553-
set_lldb_build_mode
3554-
with_pushd ${LLDB_SOURCE_DIR} \
3555-
call xcodebuild -target toolchain -configuration ${LLDB_BUILD_MODE} install ${lldb_xcodebuild_options[@]} DSTROOT="${host_install_destdir}" LLDB_TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}"
3556-
continue
3551+
macosx-*)
3552+
set_lldb_xcodebuild_options
3553+
set_lldb_build_mode
3554+
with_pushd ${LLDB_SOURCE_DIR} \
3555+
call xcodebuild -target toolchain -configuration ${LLDB_BUILD_MODE} install ${lldb_xcodebuild_options[@]} DSTROOT="${host_install_destdir}" LLDB_TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}"
3556+
continue
35573557
;;
3558-
esac
3558+
esac
3559+
else
3560+
INSTALL_TARGETS="install-lldb"
3561+
fi
35593562
;;
35603563
swiftpm)
35613564
if [[ -z "${INSTALL_SWIFTPM}" ]] ; then

0 commit comments

Comments
 (0)