Bug 659463 - Make check on mac should check that we can combine x86-32 and x86-64 to make a universal binary, instead of trying to combine x86 and PPC. r=ted
authorJustin Lebar <justin.lebar@gmail.com>
Wed, 25 May 2011 10:23:59 -0400
changeset 70157 f028ac635c6a9c73e3accf4e00d339fba007d41c
parent 70156 32b009addadd707f8582cfbd6615fa214c398a65
child 70158 4ae5181b22f70d6104e3255ee9c98ebed27624b9
push id20205
push userjlebar@mozilla.com
push dateWed, 25 May 2011 14:24:29 +0000
treeherdermozilla-central@4ae5181b22f7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs659463
milestone7.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 659463 - Make check on mac should check that we can combine x86-32 and x86-64 to make a universal binary, instead of trying to combine x86 and PPC. r=ted
build/Makefile.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -118,21 +118,21 @@ libs:: $(topsrcdir)/tools/rb/fix_stack_u
 ifeq ($(OS_ARCH),Darwin)
 libs:: $(topsrcdir)/tools/rb/fix-macosx-stack.pl
 	$(INSTALL) $< $(DIST)/bin
 libs:: $(topsrcdir)/tools/rb/fix_macosx_stack.py
 	$(INSTALL) $< $(DIST)/bin
 
 # Basic unit tests for some stuff in the unify script
 check::
-# build ppc/i386 binaries, and unify them
-	rm -f unify-test-ppc unify-test-i386 unify-test-universal
-	$(HOST_CC) -arch ppc $(srcdir)/unify-test.c -o unify-test-ppc
+# build x64/i386 binaries, and unify them
+	rm -f unify-test-x64 unify-test-i386 unify-test-universal
+	$(HOST_CC) -arch x86_64 $(srcdir)/unify-test.c -o unify-test-x64
 	$(HOST_CC) -arch i386 $(srcdir)/unify-test.c -o unify-test-i386
-	@if ! $(srcdir)/macosx/universal/unify ./unify-test-ppc ./unify-test-i386 \
+	@if ! $(srcdir)/macosx/universal/unify ./unify-test-x64 ./unify-test-i386 \
           ./unify-test-universal; then \
           echo "TEST-UNEXPECTED-FAIL | build/ | unify failed to produce a universal binary!"; \
           false; \
         fi
 	@if test ! -f ./unify-test-universal; then \
           echo "TEST-UNEXPECTED-FAIL | build/ | unify failed to produce a universal binary!"; \
           false; \
         fi