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

Bug 1642092, find toolkit/locales/en-US/defines.inc for comm* builds, r=nalexander

Browse source 
This was regressed by bug 1641791, mostly for the lack of comments in at
least two places.

Differential Revision: https://phabricator.services.mozilla.com/D77590
This commit is contained in:
Axel Hecht 2020-05-31 01:30:57 +00:00
parent 6cedbd9795
commit 22b8c9b311
2 changed files with 12 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
config/config.mk
View file

@ -142,6 +142,8 @@ PGO_LDFLAGS += $(PROFILE_USE_LDFLAGS)
endif # MOZ_PROFILE_USE
endif # NO_PROFILE_GUIDED_OPTIMIZE
# Overloaded by comm builds to refer to $(commtopsrcdir), so that
# `mail` resolves in en-US builds and in repacks.
LOCALE_TOPDIR ?= $(topsrcdir)
MAKE_JARS_FLAGS = \
-t $(LOCALE_TOPDIR) \

11
toolkit/locales/l10n.mk
View file

@ -155,8 +155,17 @@ repackage-zip-%: unpack
@$(MAKE) repackage-zip AB_CD=$* ZIP_IN='$(ZIP_IN)'
# Finding toolkit's defines.inc is hard for comm-central.
# It needs to resolve mail's defines.inc relative to comm
# for en-US, and toolkit's defines.inc relative to topsrcdir.
# That's MOZILLA_DIR in their case, so fall back to that.
# This is just needed for en-US, for repacks, all paths resolve
# relative to the top-level REAL_LOCALE_MERGEDIR.
LANGPACK_DEFINES = \
$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc \
$(firstword \
$(wildcard $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc) \
$(MOZILLA_DIR)/toolkit/locales/en-US/defines.inc \
) \
$(LOCALE_SRCDIR)/defines.inc \
$(NULL)