diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-28 13:53:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-28 13:54:24 +0200 |
| commit | a1a059467b92496c99600f0fd9a91d035066c063 (patch) | |
| tree | 34ace0c9555d3f7357248661f40e388412649955 /moz/makefile.mk | |
| parent | e34c87ce752e26426e76602dbeaded704b3587a2 (diff) | |
Fix building moz on Mac OS X.
* On Mac, nss-config must not emit -rpath-link switch.
* --with-system-nss/-nspr horribly broke in combination with the
routine use of MOZ_ARCH and resulting MOZ_CROSS_COMPILE for Mac,
and the latter appears to be unnecessary for a normal build, anyway,
so is now conditional CREATE_UNIVERSAL_MAC_MOZ_ZIP, in case anybody
still uses the code to create universal moz archives.
* This in turn revealed two issues in moz that have been addressed
with a new macosx_build_fix.patch.
Diffstat (limited to 'moz/makefile.mk')
| -rw-r--r-- | moz/makefile.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 94e942f97a5e..15480f54b830 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -95,7 +95,8 @@ PATCH_FILES = \ patches/link_fontconfig.patch \ patches/brokenmakefile.patch \ patches/aix_build_fix.patch \ - patches/libpr0n_build_fix.patch + patches/libpr0n_build_fix.patch \ + patches/macosx_build_fix.patch # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) @@ -349,7 +350,7 @@ $(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack zip: \ $(MISC)$/CREATETARBALL -.IF "$(GUIBASE)"=="aqua" +.IF "$(GUIBASE)"=="aqua" && "$(CREATE_UNIVERSAL_MAC_MOZ_ZIP)"!="" MOZ_ARCH=$(eq,$(CPU),I i386 ppc) MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8) |