diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-10-20 08:55:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-10-20 08:55:11 +0000 |
| commit | e5ef05dfed2fa7aa3c47e99e998db43d852707ae (patch) | |
| tree | 8fc6497092c92efaee70a09e6403fb35600a02a7 /nss/makefile.mk | |
| parent | #i105900# fix vanilla ppc64 build (diff) | |
| download | core-e5ef05dfed2fa7aa3c47e99e998db43d852707ae.tar.gz core-e5ef05dfed2fa7aa3c47e99e998db43d852707ae.zip | |
CWS-TOOLING: rebase CWS cmcfixes64 to trunk@277035 (milestone: DEV300:m62)
Diffstat (limited to 'nss/makefile.mk')
| -rw-r--r-- | nss/makefile.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 43a087e950ca..26bc88c80146 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -45,9 +45,9 @@ all: @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'" .ENDIF -TARFILE_NAME=nss_3_12_3 +TARFILE_NAME=nss_3_12_4 TARFILE_ROOTDIR=mozilla -PATCH_FILES=nss_3_12_3.patch +PATCH_FILES=nss.patch .IF "$(debug)" != "" .ELSE @@ -58,9 +58,6 @@ BUILD_OPT=1 .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" -#LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -.EXPORT: LDFLAGS - .IF "$(BUILD64)"=="1" # force 64-bit buildmode USE_64:=1 @@ -90,7 +87,7 @@ BUILD_ACTION= $(GNUMAKE) nss_build_all .IF "$(COM)"=="GCC" -PATCH_FILES+=nss_3_12_3.patch.mingw +PATCH_FILES+=nss.patch.mingw moz_build:=$(shell cygpath -p $(MOZILLABUILD)) PATH!:=$(moz_build)/bin:$(PATH) |