From 399ebca32ea9aef35f6604722ee2c01eb360caaa Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 22 Dec 2017 07:48:14 +0900 Subject: [PATCH] Bug 1426785 - Allow more `mach artifact toolchain` calls to not use a tooltool manifest. r=gps We're about to remove some tooltool manifests, so we need those calls to work properly when TOOLTOOL_MANIFEST is not set. --HG-- extra : rebase_source : 38ca0e3b894097ed3667901b05af79062a6c82c2 --- taskcluster/scripts/builder/build-haz-linux.sh | 2 +- taskcluster/scripts/builder/sm-tooltool-config.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/taskcluster/scripts/builder/build-haz-linux.sh b/taskcluster/scripts/builder/build-haz-linux.sh index f8116bf6c8d8..3f31dc27f945 100755 --- a/taskcluster/scripts/builder/build-haz-linux.sh +++ b/taskcluster/scripts/builder/build-haz-linux.sh @@ -53,7 +53,7 @@ export MOZ_OBJDIR="$WORKSPACE/obj-analyzed" mkdir -p "$MOZ_OBJDIR" if [ -n "$DO_TOOLTOOL" ]; then - ( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v --tooltool-url https://tooltool.mozilla-releng.net/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} ) + ( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v${TOOLTOOL_MANIFEST:+ --tooltool-url https://tooltool.mozilla-releng.net/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST} --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} ) fi export NO_MERCURIAL_SETUP_CHECK=1 diff --git a/taskcluster/scripts/builder/sm-tooltool-config.sh b/taskcluster/scripts/builder/sm-tooltool-config.sh index 4225bda444c0..00e45d1bef09 100755 --- a/taskcluster/scripts/builder/sm-tooltool-config.sh +++ b/taskcluster/scripts/builder/sm-tooltool-config.sh @@ -56,7 +56,7 @@ BROWSER_PLATFORM=$PLATFORM_OS$BITS : ${TOOLTOOL_CHECKOUT:=$WORK} export TOOLTOOL_CHECKOUT -(cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain -v $TOOLTOOL_AUTH_FLAGS --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST ${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}}) +(cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain${TOOLTOOL_MANIFEST:+ -v $TOOLTOOL_AUTH_FLAGS --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST}${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}}) # Add all the tooltool binaries to our $PATH. for bin in $TOOLTOOL_CHECKOUT/*/bin $TOOLTOOL_CHECKOUT/VC/bin/Hostx64/x86; do