Bug 1562955 - remove macosx64-cctools-port job; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Tue, 02 Jul 2019 19:48:51 +0000
changeset 481011 25e2e76995872038d0982066792c59adf20b99db
parent 481010 ddc1244071646d96eb51370b0b3922699a1fb620
child 481012 502b93be5c7c9dea5f72c71e324e81820f9e5573
push id89022
push usernfroyd@mozilla.com
push dateTue, 02 Jul 2019 19:49:49 +0000
treeherderautoland@25e2e7699587 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1562955
milestone69.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
Bug 1562955 - remove macosx64-cctools-port job; r=nalexander Nothing references this job anymore. Differential Revision: https://phabricator.services.mozilla.com/D36635
taskcluster/ci/toolchain/cctools-port.yml
taskcluster/scripts/misc/build-cctools-port-macosx.sh
--- a/taskcluster/ci/toolchain/cctools-port.yml
+++ b/taskcluster/ci/toolchain/cctools-port.yml
@@ -14,27 +14,8 @@ job-defaults:
 linux64-cctools-port:
     treeherder:
         symbol: TL(cctools)
     run:
         script: build-cctools-port.sh
         toolchain-artifact: public/build/cctools.tar.xz
     toolchains:
         - linux64-clang-8
-
-macosx64-cctools-port:
-    description: "cctools-port toolchain build"
-    treeherder:
-        symbol: TM(cctools)
-    worker:
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
-    run-on-projects:
-        - trunk
-        - try
-    run:
-        script: build-cctools-port-macosx.sh
-        tooltool-downloads: internal
-        toolchain-artifact: public/build/cctools.tar.bz2
-    toolchains:
-        - linux64-cctools-port
-        - linux64-clang-8
-        - linux64-node
deleted file mode 100755
--- a/taskcluster/scripts/misc/build-cctools-port-macosx.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# cctools sometimes needs to be rebuilt when clang is modified.
-# Until bug 1471905 is addressed, increase the following number
-# when a forced rebuild of cctools is necessary: 1
-
-set -x -e -v
-
-# This script is for building cctools (Apple's binutils) for Mac OS X on
-# Linux using ctools-port (https://github.com/tpoechtrager/cctools-port).
-WORKSPACE=$HOME/workspace
-UPLOAD_DIR=$HOME/artifacts
-
-# Repository info
-: CROSSTOOL_PORT_REPOSITORY    ${CROSSTOOL_PORT_REPOSITORY:=https://github.com/tpoechtrager/cctools-port}
-: CROSSTOOL_PORT_REV           ${CROSSTOOL_PORT_REV:=8e9c3f2506b51cf56725eaa60b6e90e240e249ca}
-
-# Set some crosstools-port directories
-CROSSTOOLS_SOURCE_DIR=$WORKSPACE/crosstools-port
-CROSSTOOLS_CCTOOLS_DIR=$CROSSTOOLS_SOURCE_DIR/cctools
-CROSSTOOLS_BUILD_DIR=/tmp/cctools
-CLANG_DIR=$WORKSPACE/build/src/clang
-CCTOOLS_DIR=$WORKSPACE/build/src/cctools
-MACOSX_SDK_DIR=$WORKSPACE/build/src/MacOSX10.11.sdk
-
-TARGET_TRIPLE=x86_64-apple-darwin
-
-# Create our directories
-mkdir -p $CROSSTOOLS_BUILD_DIR
-
-git clone --no-checkout $CROSSTOOL_PORT_REPOSITORY $CROSSTOOLS_SOURCE_DIR
-cd $CROSSTOOLS_SOURCE_DIR
-git checkout $CROSSTOOL_PORT_REV
-# Cherry pick two fixes for LTO.
-git cherry-pick -n 82381f5038a340025ae145745ae5b325cd1b749a
-git cherry-pick -n 328c7371008a854af30823adcd4ec1e763054a1d
-echo "Building from commit hash `git rev-parse $CROSSTOOL_PORT_REV`..."
-
-# Fetch clang from tooltool
-cd $WORKSPACE/build/src
-. taskcluster/scripts/misc/tooltool-download.sh
-
-# Configure crosstools-port
-cd $CROSSTOOLS_CCTOOLS_DIR
-export CC=$CLANG_DIR/bin/clang
-export CXX=$CLANG_DIR/bin/clang++
-export CFLAGS="-mcpu=generic -mtune=generic -O3 -target $TARGET_TRIPLE -isysroot $MACOSX_SDK_DIR"
-export CXXFLAGS="-mcpu=generic -mtune=generic -O3 -target $TARGET_TRIPLE -isysroot $MACOSX_SDK_DIR"
-export LDFLAGS="-Wl,-syslibroot,$MACOSX_SDK_DIR -Wl,-dead_strip"
-# TODO: bug 1357317 to avoid the LD_LIBRARY_PATH.
-export LD_LIBRARY_PATH="$CLANG_DIR/lib"
-export PATH="$CCTOOLS_DIR/bin:$PATH"
-./autogen.sh
-./configure --prefix=$CROSSTOOLS_BUILD_DIR --build=$MACHTYPE --host=$TARGET_TRIPLE --with-llvm-config=$CLANG_DIR/bin/llvm-config
-
-# Build cctools
-make -j `nproc --all` install
-$CCTOOLS_DIR/bin/$TARGET_TRIPLE-strip $CROSSTOOLS_BUILD_DIR/bin/*
-
-# Put a tarball in the artifacts dir
-mkdir -p $UPLOAD_DIR
-tar cjf $UPLOAD_DIR/cctools.tar.bz2 -C $CROSSTOOLS_BUILD_DIR/.. `basename $CROSSTOOLS_BUILD_DIR`