summaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2012-01-04 23:36:45 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2012-01-04 23:46:43 +0100
commit39042cce6685fc9db5ee20957bcc7ac584c28554 (patch)
tree89b2b2fcab44d2cb503606333531c1c594e08683 /nss
parent4572e00ec358f507e64cbab9d9f3430ea6f97d51 (diff)
compile nss against the Mac OSX SDK
nss-3.12.8/mozilla/security/coreconf/Darwin.mk claims gcc would pass syslibroot according to passed -isysroot parameter, hence let's try it for now, although I'm not 100% confident in this statement. libs that get linked without syslibroot include libsqlite3.dylib - and that is a known troublemaker…
Diffstat (limited to 'nss')
-rw-r--r--nss/makefile.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk
index dbb5f072caa9..93cd3d7c7a7d 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -82,13 +82,8 @@ USE_64:=1
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)"=="MACOSX"
-.IF "$(EXTRA_CFLAGS)"!=""
-CPP:=gcc -E $(EXTRA_CFLAGS)
-CXX:=g++ $(EXTRA_CFLAGS)
-CC:=gcc $(EXTRA_CFLAGS)
-MACOS_SDK_DIR*=$(MACDEVSDK)
-.EXPORT : CPP MACOS_SDK_DIR
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
+MACOS_SDK_DIR:=$(MACOSX_SDK_PATH)
+.EXPORT : MACOS_SDK_DIR
.ENDIF # "$(OS)"=="MACOSX"
OUT2LIB=mozilla/dist/out/lib/*$(DLLPOST) mozilla/dist/out/lib/libcrmf.a