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

--HG--
extra : moz-landing-system : lando

build/moz.configure/android-ndk.configure

@@ -246,9 +246,9 @@ def android_toolchain_prefix_base(target):
     return target.toolchain
 
 
-option(env='STLPORT_CPPFLAGS',
+js_option(env='STLPORT_CPPFLAGS',
-       nargs=1,
+          nargs=1,
-       help='Options compiler should pass for standard C++ library')
+          help='Options compiler should pass for standard C++ library')
 
 
 @depends('STLPORT_CPPFLAGS', ndk, '--help')

build/moz.configure/rust.configure

@@ -252,9 +252,6 @@ 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')
 

old-configure.in

@@ -3712,10 +3712,7 @@ export MOZ_ZLIB_LIBS
 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
 unset MOZ_BUILD_APP
 export DIST