nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1444141 - part 4 - make the JS engine depend on Rust; r=chmanchester,glandium,jorendorff

Browse source 
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.
This commit is contained in:
Nathan Froyd 2018-08-02 11:00:21 -05:00
parent 01b2107f8d
commit 3dc6481a30
4 changed files with 5 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
js/moz.configure
View file

@ -18,6 +18,9 @@ def building_js(build_project, help):
option(env='JS_STANDALONE', default=building_js, option(env='JS_STANDALONE', default=building_js,
help='Reserved for internal use') help='Reserved for internal use')
include('../build/moz.configure/rust.configure',
when='--enable-compile-environment')
@depends('JS_STANDALONE') @depends('JS_STANDALONE')
def js_standalone(value): def js_standalone(value):
if value: if value:

2
moz.configure
View file

@ -141,7 +141,7 @@ include('build/moz.configure/warnings.configure',
when='--enable-compile-environment') when='--enable-compile-environment')
include('build/moz.configure/flags.configure', include('build/moz.configure/flags.configure',
when='--enable-compile-environment') when='--enable-compile-environment')
# rust.configure is included by js/moz.configure.
js_option('--enable-valgrind', js_option('--enable-valgrind',
help='Enable Valgrind integration hooks') help='Enable Valgrind integration hooks')

1
old-configure.in
View file

@ -4658,6 +4658,7 @@ export MOZ_APP_NAME
export MOZ_APP_REMOTINGNAME export MOZ_APP_REMOTINGNAME
export MOZ_DEV_EDITION export MOZ_DEV_EDITION
export RUSTC export RUSTC
export CARGO
export MOZILLA_CENTRAL_PATH=$_topsrcdir export MOZILLA_CENTRAL_PATH=$_topsrcdir
export STLPORT_CPPFLAGS export STLPORT_CPPFLAGS
export STLPORT_LIBS export STLPORT_LIBS

5
toolkit/moz.configure
View file

@ -94,11 +94,6 @@ set_define('MOZ_PULSEAUDIO', depends_if(pulseaudio)(lambda _: True))
include('../js/moz.configure') include('../js/moz.configure')
# Rust
# ==============================================================
include('../build/moz.configure/rust.configure',
when='--enable-compile-environment')
# NodeJS # NodeJS
# ============================================================== # ==============================================================
include('../build/moz.configure/node.configure') include('../build/moz.configure/node.configure')