Bug 1520340 - Use js_options instead of exported variables from old-configure for a few variables. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 15 Jan 2019 23:33:47 +0000
changeset 454202 fad773445014ef73076aae5f2460984c79b37a3c
parent 454201 5b6434fa88d4595c3990604ef99c95d1c8ca48e7
child 454203 7695daf6bc2da8616269282f55b4bf88b2a8abc3
push id111221
push useraiakab@mozilla.com
push dateThu, 17 Jan 2019 04:23:38 +0000
treeherdermozilla-inbound@eea973d37842 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1520340
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
build/moz.configure/android-ndk.configure
build/moz.configure/rust.configure
old-configure.in
--- a/build/moz.configure/android-ndk.configure
+++ b/build/moz.configure/android-ndk.configure
@@ -241,19 +241,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:
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -247,19 +247,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).
--- a/old-configure.in
+++ b/old-configure.in
@@ -3707,20 +3707,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 CARGO
 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 RANLIB
 export AR
 export CPP