Tweak cctools build script (No bug, NPOTB)
authorTed Mielczarek <ted@mielczarek.org>
Wed, 09 Sep 2015 11:36:28 -0400
changeset 294491 8dd3dae98f2ac92ef8354d6bd4fe050b3ae5cb4a
parent 294490 a4d5db73d21ec823052cce0a88e50a896cf7c330
child 294492 c32ca21184844542fa2b9ab9659e6cfb7c93434f
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Tweak cctools build script (No bug, NPOTB)
testing/taskcluster/scripts/misc/build-cctools.sh
--- a/testing/taskcluster/scripts/misc/build-cctools.sh
+++ b/testing/taskcluster/scripts/misc/build-cctools.sh
@@ -4,17 +4,21 @@ set -x -e -v
 # This script is for building cctools (Apple's binutils) for Linux using
 # crosstool-ng (https://github.com/diorcety/crosstool-ng).
 
 WORKSPACE=$HOME/workspace
 UPLOAD_DIR=$WORKSPACE/artifacts
 
 # Repository info
 : CROSSTOOL_NG_REPOSITORY    ${CROSSTOOL_NG_REPOSITORY:=https://github.com/diorcety/crosstool-ng}
-: CROSSTOOL_NG_REV           ${CROSSTOOL_NG_HEAD_REV:=master}
+: CROSSTOOL_NG_REV           ${CROSSTOOL_NG_REV:=master}
+
+# hacky
+ln -s `which gcc` ~/bin/x86_64-linux-gnu-gcc
+export PATH=$PATH:~/bin
 
 # Set some crosstools-ng directories
 CT_TOP_DIR=$WORKSPACE/crosstool-ng-build
 CT_PREFIX_DIR=$WORKSPACE/cctools
 CT_SRC_DIR=$CT_TOP_DIR/src
 CT_TARBALLS_DIR=$CT_TOP_DIR
 CT_WORK_DIR=$CT_SRC_DIR
 CT_LIB_DIR=$WORKSPACE/crosstool-ng
@@ -24,30 +28,29 @@ CT_BUILDTOOLS_PREFIX_DIR=$CT_PREFIX_DIR
 
 # Create our directories
 rm -rf $CT_TOP_DIR
 mkdir $CT_TOP_DIR
 rm -rf $CT_PREFIX_DIR
 mkdir $CT_PREFIX_DIR
 mkdir -p $CT_SRC_DIR
 
-# Work around one of the desktop-build hacks until we undo it.
-mkdir -p /home/worker/workspace/build/src/gcc/bin/
-ln -s `readlink -f /usr/bin/x86_64-linux-gnu-gcc.orig` /home/worker/workspace/build/src/gcc/bin/gcc
-
 # Clone the crosstool-ng repo
 tc-vcs checkout $CT_LIB_DIR $CROSSTOOL_NG_REPOSITORY $CROSSTOOL_NG_REPOSITORY $CROSSTOOL_NG_REV
 
 # Fetch clang from tooltool
 cd $WORKSPACE
 wget -O tooltool.py https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py
 chmod +x tooltool.py
 : TOOLTOOL_CACHE                ${TOOLTOOL_CACHE:=/home/worker/tooltool-cache}
 export TOOLTOOL_CACHE
-sh $WORKSPACE/build/tools/scripts/tooltool/tooltool_wrapper.sh $WORKSPACE/build/src/browser/config/tooltool-manifests/linux64/clang.manifest https://api.pub.build.mozilla.org/tooltool/ setup.sh $WORKSPACE/tooltool.py
+
+wget ${GECKO_HEAD_REPOSITORY}/raw-file/${GECKO_HEAD_REV}/browser/config/tooltool-manifests/linux64/clang.manifest
+
+python tooltool.py -v --manifest=clang.manifest fetch
 
 # Copy clang into the crosstools-ng srcdir
 cp -Rp $CT_LLVM_DIR $CT_SRC_DIR
 
 # Configure crosstools-ng
 sed=sed
 CT_CONNECT_TIMEOUT=5
 CT_BINUTILS_VERSION=809