Bug 1426283 - Work around bug 1409276. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 20 Dec 2017 10:32:36 +0900
changeset 397065 7c5a3709868be88aabfa48c7a54d4a122c35340c
parent 397064 8b7e54e7c8063ccc328c4ca3d68d9b8d66769aa4
child 397066 dd70ec8799fff506944df6c1346617da85dc6383
push id33123
push userncsoregi@mozilla.com
push dateThu, 21 Dec 2017 10:00:47 +0000
treeherdermozilla-central@06a19fbe2581 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1426283, 1409276
milestone59.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 1426283 - Work around bug 1409276. r=gps Both the cc crate and the rust compiler may want to use "cc", which, on automation, points to the system GCC compiler instead of ours. As a workaround, we add a cc symbolic link in the GCC toolchain artifact so that, as long as the GCC toolchain artifact's bin directory is in $PATH early enough, it's picked over /usr/bin/cc.
build/unix/build-gcc/build-gcc.sh
--- a/build/unix/build-gcc/build-gcc.sh
+++ b/build/unix/build-gcc/build-gcc.sh
@@ -111,16 +111,17 @@ build_binutils() {
 build_gcc() {
   mkdir $root_dir/gcc-objdir
   pushd $root_dir/gcc-objdir
   ../gcc-$gcc_version/configure --prefix=${prefix-/tools/gcc} --enable-languages=c,c++  --disable-nls --disable-gnu-unique-object --enable-__cxa_atexit --with-arch-32=pentiumpro
   make $make_flags
   make $make_flags install DESTDIR=$root_dir
 
   cd $root_dir/tools
+  ln -s gcc gcc/bin/cc
   tar caf $root_dir/gcc.tar.xz gcc/
   popd
 }
 
 build_gcc_and_mingw() {
   mkdir gcc-objdir
   pushd gcc-objdir
   ../gcc-$gcc_version/configure --prefix=$install_dir --target=i686-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix