From 3dc6481a30df2de0a4e9bb5d81750f96d727a281 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Thu, 2 Aug 2018 11:00:21 -0500
Subject: [PATCH] Bug 1444141 - part 4 - make the JS engine depend on Rust;
 r=chmanchester,glandium,jorendorff

The Rust dependency in Firefox has been limited to Firefox builds by
virtue of having the Rust check in a Firefox-specific location,
toolkit/moz.configure.  For JS to start depending on Rust, we need to
move that check to a location where a standalone JS engine build will
pick up the Rust check.
---
 js/moz.configure      | 3 +++
 moz.configure         | 2 +-
 old-configure.in      | 1 +
 toolkit/moz.configure | 5 -----
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/js/moz.configure b/js/moz.configure
index f6706def33ba..47a682e551d2 100644
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -18,6 +18,9 @@ def building_js(build_project, help):
 option(env='JS_STANDALONE', default=building_js,
        help='Reserved for internal use')
 
+include('../build/moz.configure/rust.configure',
+        when='--enable-compile-environment')
+
 @depends('JS_STANDALONE')
 def js_standalone(value):
     if value:
diff --git a/moz.configure b/moz.configure
index 0bf96642120e..3b9269a3ff39 100755
--- a/moz.configure
+++ b/moz.configure
@@ -141,7 +141,7 @@ include('build/moz.configure/warnings.configure',
         when='--enable-compile-environment')
 include('build/moz.configure/flags.configure',
         when='--enable-compile-environment')
-
+# rust.configure is included by js/moz.configure.
 
 js_option('--enable-valgrind',
           help='Enable Valgrind integration hooks')
diff --git a/old-configure.in b/old-configure.in
index a7043f163c07..6ec3f9cc9409 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -4658,6 +4658,7 @@ export MOZ_APP_NAME
 export MOZ_APP_REMOTINGNAME
 export MOZ_DEV_EDITION
 export RUSTC
+export CARGO
 export MOZILLA_CENTRAL_PATH=$_topsrcdir
 export STLPORT_CPPFLAGS
 export STLPORT_LIBS
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 171cd2c3d5bf..c60e0d61f38b 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -94,11 +94,6 @@ set_define('MOZ_PULSEAUDIO', depends_if(pulseaudio)(lambda _: True))
 include('../js/moz.configure')
 
 
-# Rust
-# ==============================================================
-include('../build/moz.configure/rust.configure',
-        when='--enable-compile-environment')
-
 # NodeJS
 # ==============================================================
 include('../build/moz.configure/node.configure')