Keep build files in sync (Port Bug 1342450: Keep webrender disabled by default on OS X buildbot builders). rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Thu, 23 Mar 2017 14:08:45 +0100
changeset 27960 ea538d555890a7fa33b97de780bb5d09b230f428
parent 27959 9eececb32fa0067de71c75e202a7b29543f211b6
child 27961 a57fcd7bbe43749b41a85f39e0092d1fda4c69c8
push id1966
push userclokep@gmail.com
push dateMon, 12 Jun 2017 16:57:35 +0000
treeherdercomm-beta@32d9b8d10da1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1342450
Keep build files in sync (Port Bug 1342450: Keep webrender disabled by default on OS X buildbot builders). rs=bustage-fix
build/macosx/local-mozconfig.common
--- a/build/macosx/local-mozconfig.common
+++ b/build/macosx/local-mozconfig.common
@@ -27,16 +27,21 @@ elif [ -d "$topsrcdir/../clang" ]; then
     ldflags="-B$topsrcdir/../cctools/bin"
 fi
 
 # Ensure the updated linker doesn't generate things our older build tools
 # don't understand.
 ldflags="$ldflags -Wl,-no_data_in_code_info"
 export LDFLAGS="$ldflags"
 
+# Until bug 1342503 is fixed, we can't build some of the webrender dependencies
+# on buildbot OS X builders, because rustc will use some random system toolchain
+# instead of the one we package with tooltool.
+ac_add_options --disable-webrender
+
 # If not set use the system default clang
 if [ -z "$CC" ]; then
     export CC=clang
 fi
 
 # If not set use the system default clang++
 if [ -z "$CXX" ]; then
     export CXX=clang++