Skip to content

Commit

Permalink
Bug 1519319 - Move bindgen.configure include to js/moz.configure. r=f…
Browse files Browse the repository at this point in the history
…roydnj

Bindgen is only used when building js or toolkit, so we only need to
include the configure part in js/moz.configure, which is included in
both cases.

Depends on D16293

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

--HG--
extra : moz-landing-system : lando
  • Loading branch information
glandium committed Jan 11, 2019
1 parent fd2ad54 commit 367db61
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 2 additions & 0 deletions js/moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ def building_js(build_project):
option(env='JS_STANDALONE', default=building_js,
help='Reserved for internal use')

include('../build/moz.configure/bindgen.configure',
when='--enable-compile-environment')
include('../build/moz.configure/rust.configure',
when='--enable-compile-environment')

Expand Down
3 changes: 0 additions & 3 deletions moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,6 @@ set_config('IMPORT_LIB_SUFFIX', library_name_info.import_lib.suffix)
set_define('MOZ_DLL_PREFIX', depends(library_name_info.dll.prefix)(lambda s: '"%s"' % s))
set_define('MOZ_DLL_SUFFIX', depends(library_name_info.dll.suffix)(lambda s: '"%s"' % s))

# Depends on host_library_name_info, so needs to go here.
include('build/moz.configure/bindgen.configure',
when='--enable-compile-environment')
include(include_project_configure)

@depends('--help')
Expand Down

0 comments on commit 367db61

Please sign in to comment.