Bug 1283898 - Don't check for rust outside of toolkit builds. r?gps draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 15 Dec 2016 13:40:06 -0800
changeset 450060 420b16121d87b8ded6afa318fe6ad823ec0ed771
parent 450059 844873c84574d4a8f63b90eea3b317bd9b235d3d
child 539659 a6f4e964f44263718f049e4a3afd067ca57fd18e
push id38750
push userbmo:giles@thaumas.net
push dateThu, 15 Dec 2016 22:11:32 +0000
reviewersgps
bugs1283898
milestone53.0a1
Bug 1283898 - Don't check for rust outside of toolkit builds. r?gps Spidermonkey doesn't currently depend on rust code, and this unblocks enabling rust by default on gecko builds until we can get the appropriate toolchain hooked up to all of the SM automation jobs. The include must be conditional to avoid breaking artifact builds. MozReview-Commit-ID: 1PmcFvcZLM2
build/moz.configure/toolchain.configure
toolkit/moz.configure
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -967,9 +967,8 @@ set_define('HAVE_VISIBILITY_ATTRIBUTE',
 set_config('WRAP_SYSTEM_INCLUDES', wrap_system_includes)
 set_config('VISIBILITY_FLAGS', visibility_flags)
 
 @depends(target)
 def is_windows(target):
     return target.kernel == 'WINNT'
 
 include('windows.configure', when=is_windows)
-include('rust.configure')
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -81,16 +81,22 @@ def jack(value):
 set_config('MOZ_JACK', jack)
 set_define('MOZ_JACK', jack)
 
 # Javascript engine
 # ==============================================================
 include('../js/moz.configure')
 
 
+# Rust
+# ==============================================================
+include('../build/moz.configure/rust.configure',
+        when='--enable-compile-environment')
+
+
 # L10N
 # ==============================================================
 option('--with-l10n-base', nargs=1, env='L10NBASEDIR',
        help='Path to l10n repositories')
 
 @depends('--with-l10n-base')
 @imports(_from='os.path', _import='isdir')
 def l10n_base(value):