diff options
| author | Mathias Michel <matm@gmx.fr> | 2012-12-04 03:35:14 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2012-12-04 10:53:36 +0000 |
| commit | a0c53a961a0af21f69f592b43799cd635c994810 (patch) | |
| tree | 202006572b8daba3a5b9e2a974f36bb281e2b6cf /nss | |
| parent | 7afb54926b55e02ccd9bbb80679e2591d73dc0ca (diff) | |
First fix for fdo#56902
Restrict moz to windows, and build vars also
impacts nss, connectivity
Change-Id: I27aae1398f3f8a4d046c2c7805d64bc7523c7282
Reviewed-on: https://gerrit.libreoffice.org/1233
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/README | 2 | ||||
| -rw-r--r-- | nss/makefile.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nss/README b/nss/README index f11d2575ed15..18267ebcb3a0 100644 --- a/nss/README +++ b/nss/README @@ -6,7 +6,7 @@ nss contains the security libraries which are also part of moz. However nss is meant to be more current, that is it to be updated more often. This should be easier than doing this with moz. -If nss is build depends on an environment variable (SYSTEM_NSS=NO) which +If nss is built depends on an environment variable (SYSTEM_NSS=NO) which is per default set to YES. In this case nss is build before moz. The nss libraries/lib files/headers built in moz are then not delivered. Otherwise they would overwrite those from nss. That is, the nss libraries build in moz are diff --git a/nss/makefile.mk b/nss/makefile.mk index eed291a3289c..b1c38314f9e0 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -181,7 +181,7 @@ PATCH_FILES += \ nss.patch.mingw \ -PATH!:=$(MOZILLABUILD)/bin:$(PATH) +PATH!:=$(NSSBUILDTOOLS)/bin:$(PATH) nss_CC=$(CC) nss_CXX=$(CXX) @@ -217,7 +217,7 @@ OUT2LIB= \ .ELSE # "$(COM)"=="GCC" MOZ_MSVCVERSION= 9 .EXPORT : MOZ_MSVCVERSION -moz_build:=$(shell cygpath -p $(MOZILLABUILD)) +nss_build:=$(shell cygpath -p $(NSSBUILDTOOLS)) #Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll #become libnspr4.dll, libplc4.dll, libplds4.dll @@ -234,7 +234,7 @@ PASS_USE_64=USE_64=1 .ENDIF NSS_BUILD_DIR=$(ABS_PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss -BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && $(MOZILLABUILD)/msys/bin/bash -i \ +BUILD_ACTION= PATH="$(nss_build)/msys/bin:$(nss_build)/moztools/bin:$(PATH)" && $(NSSBUILDTOOLS)/msys/bin/bash -i \ -c "cd $(NSS_BUILD_DIR) && make $(PASS_USE_64) nss_build_all" OUT2LIB= \ |