Bug 1424171: Allow passing defines to compare-locales; r=Pike,ted
authorTom Prince <mozilla@hocat.ca>
Mon, 11 Dec 2017 14:53:03 -0700
changeset 450056 54015b4eb2ed3b79d5513c0a7547bae586dc6715
parent 450055 bd11f296e5ed66413b24d091dd78bbf49a352b29
child 450057 6e1f415d09e80e1914b649d5780c580f3e038423
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPike, ted
bugs1424171
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1424171: Allow passing defines to compare-locales; r=Pike,ted MozReview-Commit-ID: DforOC6WFoL
toolkit/locales/l10n.mk
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -187,17 +187,17 @@ merge-%:
 # from l10n-central.
 ifdef NIGHTLY_BUILD
 	@if  ! test -d $(L10NBASEDIR)/$(AB_CD) ; then \
 		$(NSINSTALL) -D $(L10NBASEDIR) ; \
 		$(L10N_CO) ; \
 	fi
 endif
 	$(RM) -rf $(REAL_LOCALE_MERGEDIR)
-	-$(MOZILLA_DIR)/mach compare-locales --merge $(BASE_MERGE) $(srcdir)/l10n.toml $(L10NBASEDIR) $*
+	-$(MOZILLA_DIR)/mach compare-locales $(COMPARE_LOCALES_DEFINES) --merge $(BASE_MERGE) $(srcdir)/l10n.toml $(L10NBASEDIR) $*
 
 langpack-%: IS_LANGUAGE_REPACK=1
 langpack-%: IS_LANGPACK=1
 langpack-%: AB_CD=$*
 langpack-%:
 	@echo 'Making langpack $(LANGPACK_FILE)'
 	@$(MAKE) libs-$(AB_CD)
 	@$(MAKE) package-langpack-$(AB_CD)