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 /nss | |
| 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 'nss')
| -rw-r--r-- | nss/nss-config.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nss/nss-config.patch b/nss/nss-config.patch index 3f67f84ae85c..d65499fb2e95 100644 --- a/nss/nss-config.patch +++ b/nss/nss-config.patch @@ -1,6 +1,6 @@ --- /dev/null +++ misc/build/nss-3.12.8/mozilla/security/nss/nss-config.in 2010-06-11 16:35:54.946870871 +0200 -@@ -0,0 +1,144 @@ +@@ -0,0 +1,147 @@ +#!/bin/sh + +prefix=@prefix@ @@ -129,7 +129,10 @@ +fi + +if test "$echo_libs" = "yes"; then -+ libdirs="-Wl,-rpath-link,$libdir -L$libdir" ++ libdirs="-L$libdir" ++ if test `uname` != Darwin; then ++ libdirs="-Wl,-rpath-link,$libdir $libdirs" ++ fi + if test -n "$lib_ssl"; then + libdirs="$libdirs -lssl${major_version}" + fi |