diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-01-26 18:35:38 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-01-26 18:35:38 +0100 |
| commit | 8437b1f3ec0718b66f54530ae8dfcb699e9dcb6c (patch) | |
| tree | 1f4453dfdfa769eeb9c94f8fd00877a702ec0a56 /nss/makefile.mk | |
| parent | 7d0a7273deb66cb529226a17d3f470d70c779c6c (diff) | |
| parent | 48699169a2d6da38e95bf887f8ef4bc78db2416d (diff) | |
ause110: update to DEV300m70
Diffstat (limited to 'nss/makefile.mk')
| -rw-r--r-- | nss/makefile.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index a07ef63ae524..f7298740b416 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -50,6 +50,10 @@ TARFILE_MD5=6244eb0b6e2647ee50470951fa6efb47 TARFILE_ROOTDIR=mozilla PATCH_FILES=nss.patch +.IF "$(OS)"=="MACOSX" +PATCH_FILES+=nss_macosx.patch +.ENDIF # "$(OS)"=="MACOSX" + .IF "$(debug)" != "" .ELSE BUILD_OPT=1 @@ -65,13 +69,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" |