diff options
| author | Steven Schlansker <sschlansker@opentable.com> | 2016-01-26 13:20:38 -0800 |
|---|---|---|
| committer | Steven Schlansker <sschlansker@opentable.com> | 2016-07-28 11:00:11 -0700 |
| commit | 2a9c27003e57380b4daf150095ce2f856e484768 (patch) | |
| tree | 3f73d256687259ed1497fe80534276a1229c378a /build | |
| parent | cb044c5bb79b65b0dc7aad5afc6188284a8163e2 (diff) | |
| download | palemoon-gre-2a9c27003e57380b4daf150095ce2f856e484768.tar.gz | |
Disable i386 build on Mac, and fix Make code that assumes multi-arch builds
Diffstat (limited to 'build')
| -rw-r--r-- | build/macosx/universal/flight.mk | 17 | ||||
| -rw-r--r-- | build/macosx/universal/mozconfig | 6 |
2 files changed, 7 insertions, 16 deletions
diff --git a/build/macosx/universal/flight.mk b/build/macosx/universal/flight.mk index d24e4d362..fc895b227 100644 --- a/build/macosx/universal/flight.mk +++ b/build/macosx/universal/flight.mk @@ -7,14 +7,12 @@ # the two OBJDIRs. ifndef OBJDIR -OBJDIR_ARCH_1 = $(MOZ_OBJDIR)/$(firstword $(MOZ_BUILD_PROJECTS)) -OBJDIR_ARCH_2 = $(MOZ_OBJDIR)/$(word 2,$(MOZ_BUILD_PROJECTS)) -DIST_ARCH_1 = $(OBJDIR_ARCH_1)/dist -DIST_ARCH_2 = $(OBJDIR_ARCH_2)/dist -DIST_UNI = $(DIST_ARCH_1)/universal -OBJDIR = $(OBJDIR_ARCH_1) +OBJDIR = $(MOZ_OBJDIR)/$(firstword $(MOZ_BUILD_PROJECTS)) endif +DIST_ARCH = $(OBJDIR)/dist +DIST_UNI = $(DIST_ARCH)/universal + topsrcdir = $(TOPSRCDIR) DEPTH = $(OBJDIR) include $(OBJDIR)/config/autoconf.mk @@ -25,11 +23,8 @@ DIST = $(OBJDIR)/dist postflight_all: mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME) - rm -f $(DIST_ARCH_2)/universal - ln -s $(call core_abspath,$(DIST_UNI)) $(DIST_ARCH_2)/universal -# Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1 -# actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2. - $(MAKE) -C $(OBJDIR_ARCH_1)/$(MOZ_BUILD_APP)/installer \ +# Stage a package for buildsymbols to be happy. + $(MAKE) -C $(OBJDIR)/$(MOZ_BUILD_APP)/installer \ PKG_SKIP_STRIP=1 stage-package ifdef ENABLE_TESTS # Now, repeat the process for the test package. diff --git a/build/macosx/universal/mozconfig b/build/macosx/universal/mozconfig index fd1b3ee92..fbb287d1b 100644 --- a/build/macosx/universal/mozconfig +++ b/build/macosx/universal/mozconfig @@ -2,10 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# i386/x86-64 Universal Build mozconfig - -# As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments -# to gcc's -arch parameter. -mk_add_options MOZ_BUILD_PROJECTS="i386 x86_64" +# Mac OS X build mozconfig, x86_64 only. . $topsrcdir/build/macosx/universal/mozconfig.common |