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
This commit is contained in:
Mike Hommey 2019-01-15 23:33:47 +00:00
Родитель 08382f397b
Коммит 13b49eda02
3 изменённых файлов: 3 добавлений и 9 удалений

Просмотреть файл

@ -246,7 +246,7 @@ def android_toolchain_prefix_base(target):
return target.toolchain 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')

Просмотреть файл

@ -252,9 +252,6 @@ set_config('RUST_TARGET_ENV_NAME', rust_target_env_name)
# This is used for putting source info into symbol files. # This is used for putting source info into symbol files.
set_config('RUSTC_COMMIT', depends(rustc_info)(lambda i: i.commit)) 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. # Rustdoc is required by Rust tests below.
js_option(env='RUSTDOC', nargs=1, help='Path to the rustdoc program') js_option(env='RUSTDOC', nargs=1, help='Path to the rustdoc program')

Просмотреть файл

@ -3712,10 +3712,7 @@ export MOZ_ZLIB_LIBS
export MOZ_APP_NAME export MOZ_APP_NAME
export MOZ_APP_REMOTINGNAME export MOZ_APP_REMOTINGNAME
export MOZ_DEV_EDITION export MOZ_DEV_EDITION
export RUSTC
export CARGO
export MOZILLA_CENTRAL_PATH=$_topsrcdir export MOZILLA_CENTRAL_PATH=$_topsrcdir
export STLPORT_CPPFLAGS
export STLPORT_LIBS export STLPORT_LIBS
unset MOZ_BUILD_APP unset MOZ_BUILD_APP
export DIST export DIST