Bug 1278812 - Change default mac filename to be 'mac' rather than 'mac64' now that bug 1295375 has moved us away from universal builds. r=gps

MozReview-Commit-ID: 4z5lozKd9tI

--HG--
extra : rebase_source : ea41981dd6175c677c4c17551240126c9f93b061
This commit is contained in:
Mark Banner 2016-12-13 10:11:59 +00:00
parent eb5f79ce29
commit e1cb180728
2 changed files with 1 additions and 5 deletions

View File

@ -452,7 +452,7 @@ JOB_DETAILS = {
'public/build/target\.common\.tests\.zip')),
'macosx64-opt': (MacArtifactJob, ('public/build/firefox-(.*)\.mac\.dmg',
'public/build/firefox-(.*)\.common\.tests\.zip')),
'macosx64-debug': (MacArtifactJob, ('public/build/firefox-(.*)\.mac64\.dmg',
'macosx64-debug': (MacArtifactJob, ('public/build/firefox-(.*)\.mac\.dmg',
'public/build/firefox-(.*)\.common\.tests\.zip')),
'win32-opt': (WinArtifactJob, ('public/build/firefox-(.*)\.win32.zip',
'public/build/firefox-(.*)\.common\.tests\.zip')),

View File

@ -34,13 +34,9 @@ ifeq ($(OS_ARCH),Darwin)
ifdef UNIVERSAL_BINARY
MOZ_PKG_PLATFORM := mac
else
ifeq ($(TARGET_CPU),x86_64)
MOZ_PKG_PLATFORM := mac64
else
MOZ_PKG_PLATFORM := mac
endif
endif
endif
ifeq ($(TARGET_OS),linux-gnu)
MOZ_PKG_PLATFORM := linux-$(TARGET_CPU)
endif