Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 911902 - Build ffi and icu during the compile tier instead of export. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2013-09-06 09:20:16 +09:00
parent 265e821783
commit 233cf0e229
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/Makefile.in
View File

@ -206,13 +206,15 @@ jsconfig_FILES = $(export_files)
jsconfig_DEST = $(DIST)/include
jsconfig_TARGET := export
.PHONY: buildffi buildicu
buildffi buildicu:
compile:: buildffi buildicu
include $(topsrcdir)/config/rules.mk
ifdef JS_HAS_CTYPES
ifndef MOZ_NATIVE_FFI
# Build libffi proper as part of the 'exports' target, so things get built
# in the right order.
export::
buildffi:
$(call SUBMAKE,,ctypes/libffi)
distclean clean::
@ -252,14 +254,12 @@ ifeq ($(OS_ARCH),WINNT)
cp -p intl/icu/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/lib/$(libname).lib;)
endif
# - Build ICU as part of the "export" target, so things get built
# in the right order.
# - ICU requires GNU make according to its readme.html. pymake can't be used
# because it doesn't support order only dependencies.
# - Force ICU to use the standard suffix for object files because expandlibs
# will discard all files with a non-standard suffix (bug 857450).
# - Options for genrb: -k strict parsing; -R omit collation tailoring rules.
export::
buildicu:
$(GMAKE) $(ICU_GMAKE_OPTIONS) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
$(ICU_LIB_RENAME)