bug 1203689 - Use tooltool gcc as host compiler for cross-mac builds. r=dustin
authorTed Mielczarek <ted@mielczarek.org>
Thu, 10 Sep 2015 15:21:31 -0400
changeset 294489 561ee2071aece2fb4ff3d7dbe4b83664c431c5f3
parent 294488 673aec9df33d138692845be1e7eb68da72ab966a
child 294490 a4d5db73d21ec823052cce0a88e50a896cf7c330
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)
reviewersdustin
bugs1203689
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
bug 1203689 - Use tooltool gcc as host compiler for cross-mac builds. r=dustin
browser/config/tooltool-manifests/macosx64/cross-releng.manifest
build/macosx/cross-mozconfig.common
--- a/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
@@ -5,16 +5,23 @@
 {
 "size": 70350828, 
 "digest": "6cd04e8ec44c6fef159349c22bd0476891e4a2d46479f9586283eaf3305e42f79c720d40dfec0e78d8899c1651189b12e285de60862ffd0612b0dac7a0c336c6", 
 "algorithm": "sha512", 
 "unpack": true,
 "filename": "clang.tar.bz2"
 },
 {
+"size": 80458572,
+"digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
+"algorithm": "sha512", 
+"filename": "gcc.tar.xz",
+"unpack": true
+},
+{
 "size": 3008804, 
 "visibility": "public", 
 "digest": "ba6937f14f3d8b26dcb2d39490dee6b0a8afb60f672f5debb71d7b62c1ec52103201b4b1a3d258f945567de531384b36ddb2ce4aa73dc63d72305b11c146847c", 
 "algorithm": "sha512", 
 "unpack": true,
 "filename": "cctools.tar.gz"
 },
 {
--- a/build/macosx/cross-mozconfig.common
+++ b/build/macosx/cross-mozconfig.common
@@ -33,18 +33,20 @@ export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_P
 #TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically
 export AR=${TOOLCHAIN_PREFIX}ar
 export RANLIB=${TOOLCHAIN_PREFIX}ranlib
 export STRIP=${TOOLCHAIN_PREFIX}strip
 export OTOOL=${TOOLCHAIN_PREFIX}otool
 export GENISOIMAGE=$topsrcdir/genisoimage/genisoimage
 export DMG_TOOL=$topsrcdir/dmg/dmg
 
-export HOST_CC=gcc
-export HOST_CXX=g++
+# The system gcc installed on CentOS 6 is 4.4, which our
+# build system rejects.
+export HOST_CC="$topsrcdir/gcc/bin/gcc"
+export HOST_CXX="$topsrcdir/gcc/bin/g++"
 export HOST_LDFLAGS="-g"
 
 ac_add_options --target=x86_64-apple-darwin
 ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS
 
 . "$topsrcdir/build/mozconfig.cache"
 
 export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token