Merge pull request #33524 from gottesmm/pr-4bbf9f051aa3180571b8238e3cb830bd4d0696c3

[build-toolchain] Add support for specifying a preset file.

Author: gottesmm

utils/build-toolchain

@@ -29,6 +29,12 @@ function usage() {
   echo "--distcc"
   echo "Build with distcc to speed up the toolchain build"
   echo ""
+  echo "--preset-file"
+  echo "load build-script presets from the specified file"
+  echo ""
+  echo "--preset-prefix"
+  echo "Customize the preset invoked by prepending a prefix"
+  echo ""
 }
 
 RESULT_DIR=$PWD
@@ -38,6 +44,8 @@ cd "$(dirname $0)/.." || exit
 DISTCC_FLAG=
 DRY_RUN=
 BUNDLE_PREFIX=
+PRESET_FILE_FLAGS=
+PRESET_PREFIX=
 case $(uname -s) in
   Darwin)
     SWIFT_PACKAGE=buildbot_osx_package,no_test
@@ -69,6 +77,14 @@ while [ $# -ne 0 ]; do
   ;;
     --distcc)
       DISTCC_FLAG="--distcc"
+  ;;
+    --preset-file)
+      shift
+      PRESET_FILE_FLAGS="${PRESET_FILE_FLAGS} --preset-file=$1"
+  ;;
+    --preset-prefix)
+      shift
+      PRESET_PREFIX="$1"
   ;;
   -h|--help)
     usage
@@ -115,8 +131,9 @@ SWIFT_TOOLCHAIN_DIR="/Library/Developer/Toolchains/${TOOLCHAIN_NAME}.xctoolchain
 SYMBOLS_PACKAGE="${RESULT_DIR}/${SYM_ARCHIVE}"
 DRY_RUN="${DRY_RUN}"
 DISTCC_FLAG="${DISTCC_FLAG}"
+PRESET_FILE_FLAGS="${PRESET_FILE_FLAGS}"
 
-./utils/build-script ${DRY_RUN} ${DISTCC_FLAG} --preset="${SWIFT_PACKAGE}" \
+./utils/build-script ${DRY_RUN} ${DISTCC_FLAG} ${PRESET_FILE_FLAGS} --preset="${PRESET_PREFIX}${SWIFT_PACKAGE}" \
         install_destdir="${SWIFT_INSTALL_DIR}" \
         installable_package="${SWIFT_INSTALLABLE_PACKAGE}" \
         install_toolchain_dir="${SWIFT_TOOLCHAIN_DIR}" \