From 65efbb324131b1de3e0627c280ea6c85ac4d41f9 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Mon, 1 Feb 2016 10:20:57 -0500 Subject: [PATCH] Bug 1244261 - part 2 - use common mozconfig.rust on OS X; r=mshal Now that we have cross-compilation tooltool packages for OS X, we can use the common mozconfig to enable Rust on all OS X builds, regardless of host OS. --- browser/config/mozconfigs/macosx-universal/nightly | 2 +- browser/config/mozconfigs/macosx64/debug | 2 +- browser/config/mozconfigs/macosx64/nightly | 2 +- browser/config/mozconfigs/macosx64/opt-static-analysis | 2 +- browser/config/mozconfigs/whitelist | 2 +- build/macosx/mozconfig.rust | 6 ------ 6 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 build/macosx/mozconfig.rust diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly index 5832a3035f9..801ace4d49a 100644 --- a/browser/config/mozconfigs/macosx-universal/nightly +++ b/browser/config/mozconfigs/macosx-universal/nightly @@ -12,6 +12,6 @@ fi ac_add_options --with-branding=browser/branding/nightly -. "$topsrcdir/build/macosx/mozconfig.rust" +. "$topsrcdir/build/mozconfig.rust" . "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.cache" diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug index d6028f65087..cb96acb1e69 100644 --- a/browser/config/mozconfigs/macosx64/debug +++ b/browser/config/mozconfigs/macosx64/debug @@ -20,6 +20,6 @@ export MOZ_PACKAGE_JSSHELL=1 ac_add_options --with-branding=browser/branding/nightly -. "$topsrcdir/build/macosx/mozconfig.rust" +. "$topsrcdir/build/mozconfig.rust" . "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.cache" diff --git a/browser/config/mozconfigs/macosx64/nightly b/browser/config/mozconfigs/macosx64/nightly index 18a6532a76d..bd312855599 100644 --- a/browser/config/mozconfigs/macosx64/nightly +++ b/browser/config/mozconfigs/macosx64/nightly @@ -18,6 +18,6 @@ export MOZ_PACKAGE_JSSHELL=1 ac_add_options --with-branding=browser/branding/nightly -. "$topsrcdir/build/macosx/mozconfig.rust" +. "$topsrcdir/build/mozconfig.rust" . "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.cache" diff --git a/browser/config/mozconfigs/macosx64/opt-static-analysis b/browser/config/mozconfigs/macosx64/opt-static-analysis index 90f9f9269c1..344a9ef4cf6 100644 --- a/browser/config/mozconfigs/macosx64/opt-static-analysis +++ b/browser/config/mozconfigs/macosx64/opt-static-analysis @@ -13,7 +13,7 @@ ac_add_options --enable-warnings-as-errors ac_add_options --enable-clang-plugin -. "$topsrcdir/build/macosx/mozconfig.rust" +. "$topsrcdir/build/mozconfig.rust" . "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.cache" diff --git a/browser/config/mozconfigs/whitelist b/browser/config/mozconfigs/whitelist index 4d85bc90d9c..02a33b0048b 100644 --- a/browser/config/mozconfigs/whitelist +++ b/browser/config/mozconfigs/whitelist @@ -53,7 +53,7 @@ whitelist['nightly']['macosx-universal'] += [ 'ac_add_options --disable-install-strip', 'ac_add_options --enable-instruments', 'ac_add_options --enable-dtrace', - '. "$topsrcdir/build/macosx/mozconfig.rust"', + '. "$topsrcdir/build/mozconfig.rust"', ] whitelist['nightly']['win32'] += [ diff --git a/build/macosx/mozconfig.rust b/build/macosx/mozconfig.rust deleted file mode 100644 index 92d9a608690..00000000000 --- a/build/macosx/mozconfig.rust +++ /dev/null @@ -1,6 +0,0 @@ -# Options to enable rust in automation builds. - -if test `uname -s` != Linux; then -RUSTC="$topsrcdir/rustc/bin/rustc" -ac_add_options --enable-rust -fi