Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 958404 - Recurse ffi from top-level when building js. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2014-01-20 09:11:55 +09:00
parent 9fe01db5ab
commit bfcfeb45e4
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/Makefile.in
View File

@ -144,20 +144,9 @@ endif # ENABLE_INTL_API
include $(topsrcdir)/config/rules.mk
.PHONY: buildffi buildicu
buildffi buildicu:
$(if $(MOZ_PSEUDO_DERECURSE),compile,export):: buildffi buildicu
ifdef JS_HAS_CTYPES
ifndef MOZ_NATIVE_FFI
buildffi:
$(call SUBMAKE,,ctypes/libffi)
distclean clean::
$(call SUBMAKE,$@,ctypes/libffi)
endif
endif
.PHONY: buildicu
buildicu:
$(if $(MOZ_PSEUDO_DERECURSE),compile,export):: buildicu
#############################################
# BEGIN ECMAScript Internationalization API

2
moz.build
View File

@ -12,6 +12,8 @@ CONFIGURE_SUBST_FILES += [
if CONFIG['BUILDING_JS']:
if CONFIG['JS_STANDALONE']:
add_tier_dir('base', ['config', 'mfbt'])
if CONFIG['JS_HAS_CTYPES'] and not CONFIG['MOZ_NATIVE_FFI']:
add_tier_dir('js', ['js/src/ctypes/libffi'], static=True)
add_tier_dir('js', ['js/src'])
else:
CONFIGURE_SUBST_FILES += [