# HG changeset patch
# User Mike Hommey <mh+mozilla@glandium.org>
# Date 1547595227 0
# Node ID fad773445014ef73076aae5f2460984c79b37a3c
# Parent  51826dd0509daa7116ce9a4cc21ff314337d2c4d
Bug 1520340 - Use js_options instead of exported variables from old-configure for a few variables. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D16618

diff --git a/build/moz.configure/android-ndk.configure b/build/moz.configure/android-ndk.configure
--- a/build/moz.configure/android-ndk.configure
+++ b/build/moz.configure/android-ndk.configure
@@ -190,19 +190,19 @@ set_config('ANDROID_TOOLCHAIN', android_
 def android_toolchain_prefix_base(target):
     if target.cpu == 'x86':
         # Ideally, the --target should just have the right x86 variant
         # in the first place.
         return 'i686-linux-android'
     return target.toolchain
 
 
-option(env='STLPORT_CPPFLAGS',
-       nargs=1,
-       help='Options compiler should pass for standard C++ library')
+js_option(env='STLPORT_CPPFLAGS',
+          nargs=1,
+          help='Options compiler should pass for standard C++ library')
 
 
 @depends('STLPORT_CPPFLAGS', ndk, '--help')
 @imports(_from='os.path', _import='isdir')
 def stlport_cppflags(value, ndk, _):
     if value and len(value):
         return value.split()
     if not ndk:
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -248,19 +248,16 @@ def rust_target_env_name(triple):
 # We need this to form various Cargo environment variables, as there is no
 # uppercase function in make, and we don't want to shell out just for
 # converting a string to uppercase.
 set_config('RUST_TARGET_ENV_NAME', rust_target_env_name)
 
 # This is used for putting source info into symbol files.
 set_config('RUSTC_COMMIT', depends(rustc_info)(lambda i: i.commit))
 
-# Until we remove all the other Rust checks in old-configure.
-add_old_configure_assignment('RUSTC', rustc)
-
 # Rustdoc is required by Rust tests below.
 js_option(env='RUSTDOC', nargs=1, help='Path to the rustdoc program')
 
 rustdoc = check_prog('RUSTDOC', ['rustdoc'], paths=toolchain_search_path,
                      input='RUSTDOC', allow_missing=True)
 
 # This option is separate from --enable-tests because Rust tests are particularly
 # expensive in terms of compile time (especially for code in libxul).
diff --git a/old-configure.in b/old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -3514,19 +3514,17 @@ if test -n "$ZLIB_IN_MOZGLUE"; then
    MOZ_ZLIB_LIBS=
 fi
 export MOZ_SYSTEM_ZLIB
 export MOZ_ZLIB_CFLAGS
 export MOZ_ZLIB_LIBS
 export MOZ_APP_NAME
 export MOZ_APP_REMOTINGNAME
 export MOZ_DEV_EDITION
-export RUSTC
 export MOZILLA_CENTRAL_PATH=$_topsrcdir
-export STLPORT_CPPFLAGS
 export STLPORT_LIBS
 unset MOZ_BUILD_APP
 export DIST
 export MOZ_LINKER
 export ZLIB_IN_MOZGLUE
 export AR
 export RANLIB
 export CPP