From 9b9d8a88c776410ac83b6b8b6aa890b8053c3987 Mon Sep 17 00:00:00 2001
From: Pier Angelo Vendrame <pierov@torproject.org>
Date: Wed, 16 Nov 2022 17:34:55 +0100
Subject: [PATCH] Bug 40687: Updated the way to package locales with builds
The previous way we were using to merge locales in the builds worked
with Linux and Windows, but not with macOS.
---
projects/firefox/build | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index 16b3f752d..6610a61e5 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -168,9 +168,8 @@ export LANG=C.UTF-8
./mach build --verbose
[% IF !c("var/testbuild") %]
export MOZ_CHROME_MULTILOCALE="$supported_locales"
- for AB_CD in $MOZ_CHROME_MULTILOCALE; do
- ./mach build chrome-$AB_CD
- done
+ # No quotes on purpose, see https://firefox-source-docs.mozilla.org/build/buildsystem/locales.html#instructions-for-multi-locale-builds
+ ./mach package-multi-locale --locales en-US $MOZ_CHROME_MULTILOCALE
AB_CD=multi ./mach build stage-package
[% ELSE %]
./mach build stage-package
--
GitLab