wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 958404 - Use tiers for js build. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2014-01-20 09:11:37 +09:00
parent 3b9965d800
commit f7fb7254c8
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/recurse.mk
View File

@ -67,7 +67,8 @@ endif
# Get all directories traversed for all subtiers in the current tier, or use
# directly the $(*_dirs) variables available in root.mk when there is no
# TIERS (like for js/src).
CURRENT_DIRS := $(or $($(CURRENT_TIER)_dirs),$(foreach subtier,$(CURRENT_SUBTIERS),$($(CURRENT_TIER)_subtier_$(subtier))))
TIER_DIRS = $(or $($(1)_dirs),$(foreach subtier,$($(1)_subtiers),$($(1)_subtier_$(subtier))))
CURRENT_DIRS := $(call TIER_DIRS,$(CURRENT_TIER))
ifneq (,$(filter binaries libs,$(CURRENT_TIER)))
WANT_STAMPS = 1
@ -199,12 +200,15 @@ endif # ifeq (1_.,$(MOZ_PSEUDO_DERECURSE)_$(DEPTH))
ifdef MOZ_PSEUDO_DERECURSE
ifeq (.,$(DEPTH))
# top-level directories
recurse_targets := $(addsuffix /binaries,$(binaries_dirs))
ifdef recurse_targets
# only js/src has binaries_dirs, and we want to adjust paths for it.
ifdef BUILDING_JS
ifndef JS_STANDALONE
# Only define recurse_targets for js, when it is built as part of gecko.
recurse_targets := $(addsuffix /binaries,$(call TIER_DIRS,binaries))
# we want to adjust paths for js/src.
want_abspaths = 1
endif
endif
endif
ifdef COMPILE_ENVIRONMENT

4
moz.build
View File

@ -11,8 +11,8 @@ CONFIGURE_SUBST_FILES += [
if CONFIG['BUILDING_JS']:
if CONFIG['JS_STANDALONE']:
DIRS += ['config']
DIRS += ['js/src']
add_tier_dir('base', ['config'])
add_tier_dir('js', ['js/src'])
else:
CONFIGURE_SUBST_FILES += [
'mozilla-config.h',