Bug 1483937 - Still use GCC on MOZ_PGO builds that don't have FORCE_GCC. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 17 Aug 2018 06:49:16 +0900
changeset 487594 ddb665c7fad04681b7c449509a1cea2ce9d84e02
parent 487593 c667f8f40c65b0810e3b23fe2d635f273acc6a3f
child 487595 97b4c0e1a0144bb026949fc75afc78b972c86b0d
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1483937
milestone63.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 1483937 - Still use GCC on MOZ_PGO builds that don't have FORCE_GCC. r=froydnj Yay for inconsistencies in jobs between beta and central.
build/unix/mozconfig.linux
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -2,17 +2,17 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
   # Some nightlies (eg: Mulet) don't want these set.
   MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
 fi
 
 . "$topsrcdir/build/mozconfig.common"
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
-if [ -n "$FORCE_GCC" ]; then
+if [ -n "$FORCE_GCC" -o -n "$MOZ_PGO" ]; then
     CC="$TOOLTOOL_DIR/gcc/bin/gcc"
     CXX="$TOOLTOOL_DIR/gcc/bin/g++"
 else
     CC="$TOOLTOOL_DIR/clang/bin/clang"
     CXX="$TOOLTOOL_DIR/clang/bin/clang++"
 fi
 
 # We want to make sure we use binutils and other binaries in the tooltool