From 529e7fd529bd6d8a906787d0954fd14c4b11242a Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Fri, 31 May 2019 17:13:20 -0700 Subject: [PATCH] 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. (cherry picked from commit 78218b0c2a40377d0527167ef55734a658ff6f37) --- utils/build-script-impl | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/utils/build-script-impl b/utils/build-script-impl index 68d7f5ddd88bf..22932964f054d 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -3538,24 +3538,27 @@ for host in "${ALL_HOSTS[@]}"; do echo "--install-destdir is required to install products." exit 1 fi - - case ${host} in - linux-*) + if [[ "$using_xcodebuild" == "TRUE" ]] ; then + case ${host} in + linux-*) ;; - freebsd-*) + freebsd-*) ;; - cygwin-*) + cygwin-*) ;; - haiku-*) + haiku-*) ;; - macosx-*) - set_lldb_xcodebuild_options - set_lldb_build_mode - with_pushd ${LLDB_SOURCE_DIR} \ - call xcodebuild -target toolchain -configuration ${LLDB_BUILD_MODE} install ${lldb_xcodebuild_options[@]} DSTROOT="${host_install_destdir}" LLDB_TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}" - continue + macosx-*) + set_lldb_xcodebuild_options + set_lldb_build_mode + with_pushd ${LLDB_SOURCE_DIR} \ + call xcodebuild -target toolchain -configuration ${LLDB_BUILD_MODE} install ${lldb_xcodebuild_options[@]} DSTROOT="${host_install_destdir}" LLDB_TOOLCHAIN_PREFIX="${TOOLCHAIN_PREFIX}" + continue ;; - esac + esac + else + INSTALL_TARGETS="install-lldb" + fi ;; swiftpm) if [[ -z "${INSTALL_SWIFTPM}" ]] ; then