try: -b do -p linux,linux64 -t all -u all --rebuild-talos 10
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 03 Aug 2018 11:43:43 +0900
changeset 1657107 bda9def26ee3d0808a87b5d0b9bdd035f3bd77b1
parent 1656998 5307892d70d5a777724b82f3e8b4b9d071f06f2e
child 2269824 5f8a37af63ab296f05fe57199f5cdeb6770a84cb
push id288902
push usermh@glandium.org
push dateFri, 03 Aug 2018 05:56:22 +0000
treeherdertry@bda9def26ee3 [default view] [failures only]
milestone63.0a1
try: -b do -p linux,linux64 -t all -u all --rebuild-talos 10
build/unix/mozconfig.linux
build/unix/mozconfig.linux32
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -2,17 +2,22 @@ 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}
 
-# We deal with valgrind builds here
-CC="$TOOLTOOL_DIR/gcc/bin/gcc"
-CXX="$TOOLTOOL_DIR/gcc/bin/g++"
+# Builds on CI are all using clang, except PGO builds.
+if [ -n "$MOZ_PGO" ]; then
+    CC="$TOOLTOOL_DIR/gcc/bin/gcc"
+    CXX="$TOOLTOOL_DIR/gcc/bin/g++"
+else
+    CC="$TOOLTOOL_DIR/clang/bin/clang -gcc-toolchain $TOOLTOOL_DIR/gcc"
+    CXX="$TOOLTOOL_DIR/clang/bin/clang++ -gcc-toolchain $TOOLTOOL_DIR/gcc"
+fi
 
 # We want to make sure we use binutils and other binaries in the tooltool
 # package.
 mk_add_options "export PATH=$TOOLTOOL_DIR/gcc/bin:$PATH"
 
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
--- a/build/unix/mozconfig.linux32
+++ b/build/unix/mozconfig.linux32
@@ -1,13 +1,11 @@
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 export MOZ_LINUX_32_SSE2_STARTUP_ERROR=1
 
-CFLAGS="$CFLAGS -msse -msse2 -mfpmath=sse"
-CXXFLAGS="$CXXFLAGS -msse -msse2 -mfpmath=sse"
+CFLAGS="$CFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
+CXXFLAGS="$CXXFLAGS -march=pentium-m -msse -msse2 -mfpmath=sse"
 
 if test `uname -m` = "x86_64"; then
-  CC="$CC -m32 -march=pentium-m"
-  CXX="$CXX -m32 -march=pentium-m"
   ac_add_options --target=i686-pc-linux
   ac_add_options --host=i686-pc-linux
 fi