summaryrefslogtreecommitdiff
path: root/nss/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'nss/makefile.mk')
-rw-r--r--nss/makefile.mk14
1 files changed, 13 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 2122a168904d..94d6e60c5817 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
@@ -64,13 +68,21 @@ USE_64:=1
.ENDIF # "$(CPU)"=="X"
.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="FREEBSDGCC"
+.IF "$(CPU)"=="X"
+# force 64-bit buildmode
+USE_64:=1
+.EXPORT : USE_64
+.ENDIF # "$(CPU)"=="X"
+.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
.IF "$(OS)"=="MACOSX"
.IF "$(EXTRA_CFLAGS)"!=""
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"