summaryrefslogtreecommitdiff
path: root/nss/makefile.mk
diff options
context:
space:
mode:
authorobo <obo@openoffice.org>2010-01-04 13:10:51 +0100
committerobo <obo@openoffice.org>2010-01-04 13:10:51 +0100
commitbf3a34df7ace9332084f77bad3fedf2d1bc33bde (patch)
tree2d9d4fbe19c1ead9125d765e3186e0615717b3bb /nss/makefile.mk
parent06b1cfd68a0891c5652e7c78498e4b40afd902b2 (diff)
#i107269# build breaks for unxmacxi + seperate SDK directory
Diffstat (limited to 'nss/makefile.mk')
-rw-r--r--nss/makefile.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 2122a168904d..61bcf1a40460 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -49,6 +49,10 @@ TARFILE_NAME=nss_3_12_5
TARFILE_ROOTDIR=mozilla
PATCH_FILES=nss.patch
+.IF "$(OS)"=="MACOSX"
+PATCH_FILES+=nss_macosx.patch
+.ENDIF # "$(OS)"=="MACOSX"
+
.IF "$(debug)" != ""
.ELSE
BUILD_OPT=1
@@ -70,7 +74,8 @@ USE_64:=1
CPP:=gcc -E $(EXTRA_CFLAGS)
CXX:=g++ $(EXTRA_CFLAGS)
CC:=gcc $(EXTRA_CFLAGS)
-.EXPORT : CPP
+MACOS_SDK_DIR*=$(MACDEVSDK)
+.EXPORT : CPP MACOS_SDK_DIR
.ENDIF # "$(EXTRA_CFLAGS)"!=""
.ENDIF # "$(OS)"=="MACOSX"