Bug 1514806 Part 5 - Select the appropriate 7-zip SFX stub binary for the build target. r=firefox-build-system-reviewers,mshal#firefox-build-system-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D15983

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Matt Howell 2019-01-14 21:58:58 +00:00
Родитель 4bc199a4ea
Коммит 37e3810088
2 изменённых файлов: 10 добавлений и 2 удалений

Просмотреть файл

@ -5,7 +5,11 @@
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
CONFIG_DIR = instgen
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
ifeq ($(CPU_ARCH), aarch64)
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.ARM64.sfx
else
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.Win32.sfx
endif
INSTALLER_FILES = \
app.tag \

Просмотреть файл

@ -37,7 +37,11 @@ MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
endif
MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
ifeq ($(CPU_ARCH), aarch64)
MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.ARM64.sfx
else
MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.Win32.sfx
endif
# Required for l10n.mk - defines a list of app sub dirs that should
# be included in langpack xpis.