diff options
Diffstat (limited to 'nss/makefile.mk')
| -rw-r--r-- | nss/makefile.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index cdc7aad019bf..2122a168904d 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -45,11 +45,9 @@ all: @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'" .ENDIF -TARFILE_NAME=nss_3_12_4 +TARFILE_NAME=nss_3_12_5 TARFILE_ROOTDIR=mozilla -PATCH_FILES=nss.patch dtoa.patch - # Note: dtoa.patch fixes https://bugzilla.mozilla.org/show_bug.cgi?id=516396. It can be removed as soon as - # we upgrade to a new NSS version which already contains this fix. +PATCH_FILES=nss.patch .IF "$(debug)" != "" .ELSE @@ -57,7 +55,6 @@ BUILD_OPT=1 .EXPORT: BUILD_OPT .ENDIF - .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" .IF "$(BUILD64)"=="1" @@ -81,6 +78,10 @@ OUT2LIB=dist$/out$/lib$/*$(DLLPOST) BUILD_DIR=security$/nss BUILD_ACTION= $(GNUMAKE) nss_build_all +#See #i105566# && moz#513024# +.IF "$(OS)"=="LINUX" +BUILD_ACTION+=FREEBL_NO_DEPEND=1 +.ENDIF .ENDIF # "$(GUI)"=="UNX" |