Bug 1175359 - Enable rust in linux64 builds. r=ted
☠☠ backed out by da5fdc67cdd0 ☠ ☠
authorRalph Giles <giles@mozilla.com>
Tue, 16 Jun 2015 17:28:41 -0700
changeset 250342 58a2788fad8e73443f5923c29416f37685a00422
parent 250341 fbcedabfb8f58e38a2096281eb50b78d8f4e8c49
child 250343 b78ed11c5379cf4259a62819625eb3a36f5fe7c2
push id61521
push userrgiles@mozilla.com
push dateFri, 26 Jun 2015 19:28:01 +0000
treeherdermozilla-inbound@58a2788fad8e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1175359
milestone41.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 1175359 - Enable rust in linux64 builds. r=ted Write a mozconfig fragment which makes the rust toolchain provided by tooltool available for linux builds. Use linux64 mozconfigs to enable rust for official builds of that target. These aren't used outside of automation builds, so including rust there will verify code on check-in without requiring developers to install rust.
browser/config/mozconfigs/linux64/beta
browser/config/mozconfigs/linux64/debug
browser/config/mozconfigs/linux64/nightly
browser/config/mozconfigs/linux64/release
build/unix/mozconfig.rust.linux
--- a/browser/config/mozconfigs/linux64/beta
+++ b/browser/config/mozconfigs/linux64/beta
@@ -1,7 +1,9 @@
 . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
 
 ac_add_options --enable-official-branding
 
 mk_add_options MOZ_PGO=1
 
+. "$topsrcdir/build/unix/mozconfig.rust.linux"
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/debug
+++ b/browser/config/mozconfigs/linux64/debug
@@ -16,9 +16,11 @@ export MOZILLA_OFFICIAL=1
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
+. "$topsrcdir/build/unix/mozconfig.rust.linux"
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/nightly
+++ b/browser/config/mozconfigs/linux64/nightly
@@ -11,9 +11,11 @@ ac_add_options --enable-js-diagnostics
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
 
 ac_add_options --with-branding=browser/branding/nightly
 
 # Use ccache
 . "$topsrcdir/build/mozconfig.cache"
 
+. "$topsrcdir/build/unix/mozconfig.rust.linux"
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/release
+++ b/browser/config/mozconfigs/linux64/release
@@ -5,9 +5,11 @@
 ac_add_options --enable-official-branding
 
 mk_add_options MOZ_PGO=1
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
+. "$topsrcdir/build/unix/mozconfig.rust.linux"
+
 . "$topsrcdir/build/mozconfig.common.override"
new file mode 100644
--- /dev/null
+++ b/build/unix/mozconfig.rust.linux
@@ -0,0 +1,5 @@
+# Options to enable rust in automation builds.
+
+RUSTC="$topsrcdir/rustc/bin/rustc"
+mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$topsrcdir/rustc/lib"
+ac_add_options --enable-rust