Bug 1342450 - Keep webrender disabled by default on OS X buildbot builders. r?froydnj draft
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 22 Mar 2017 14:24:12 -0400
changeset 503042 98f9746a173592cb036a56d958e971515276846a
parent 503041 65387f61976c16c6e9990592d603a9f464ce2851
child 550320 f3a6f7814e82db80bca9f806899ab6bf05e95cbf
push id50466
push userkgupta@mozilla.com
push dateWed, 22 Mar 2017 18:24:40 +0000
reviewersfroydnj
bugs1342450
milestone55.0a1
Bug 1342450 - Keep webrender disabled by default on OS X buildbot builders. r?froydnj MozReview-Commit-ID: 9Ydrr67qKGu
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++