From b8bf69af1d3ee8175efb99ceeae09737204332db Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Tue, 16 Jun 2015 17:28:41 -0700 Subject: [PATCH] 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 | 2 ++ browser/config/mozconfigs/linux64/debug | 2 ++ browser/config/mozconfigs/linux64/nightly | 2 ++ browser/config/mozconfigs/linux64/release | 2 ++ build/unix/mozconfig.rust.linux | 5 +++++ 5 files changed, 13 insertions(+) create mode 100644 build/unix/mozconfig.rust.linux diff --git a/browser/config/mozconfigs/linux64/beta b/browser/config/mozconfigs/linux64/beta index 7c054602dfd..f40bc4131e6 100644 --- a/browser/config/mozconfigs/linux64/beta +++ b/browser/config/mozconfigs/linux64/beta @@ -4,4 +4,6 @@ ac_add_options --enable-official-branding mk_add_options MOZ_PGO=1 +. "$topsrcdir/build/unix/mozconfig.rust.linux" + . "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/debug b/browser/config/mozconfigs/linux64/debug index 8f1f458ff21..3dcaa5ce489 100644 --- a/browser/config/mozconfigs/linux64/debug +++ b/browser/config/mozconfigs/linux64/debug @@ -21,4 +21,6 @@ export MOZ_PACKAGE_JSSHELL=1 ac_add_options --with-branding=browser/branding/nightly +. "$topsrcdir/build/unix/mozconfig.rust.linux" + . "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/nightly b/browser/config/mozconfigs/linux64/nightly index 6f7812f131c..50ed71ba587 100644 --- a/browser/config/mozconfigs/linux64/nightly +++ b/browser/config/mozconfigs/linux64/nightly @@ -16,4 +16,6 @@ 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" diff --git a/browser/config/mozconfigs/linux64/release b/browser/config/mozconfigs/linux64/release index e52f33fa6b3..aed77acca46 100644 --- a/browser/config/mozconfigs/linux64/release +++ b/browser/config/mozconfigs/linux64/release @@ -10,4 +10,6 @@ mk_add_options MOZ_PGO=1 # defines.sh during the beta cycle export BUILDING_RELEASE=1 +. "$topsrcdir/build/unix/mozconfig.rust.linux" + . "$topsrcdir/build/mozconfig.common.override" diff --git a/build/unix/mozconfig.rust.linux b/build/unix/mozconfig.rust.linux new file mode 100644 index 00000000000..aaabfde3743 --- /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