[Libreoffice-commits] core.git: Branch 'aoo/trunk' - nss/makefile.mk

[Matthias Seidel]

 nss/makefile.mk |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 2a49d4b65f653b929b45c74a5da86bae5ac14eab
Author: Matthias Seidel <mseidel at apache.org>
Date:   Tue May 22 19:23:15 2018 +0000

    Enabling the use of Mozilla Build versions >= 3.0.
    
    (From 3.0 on Mozilla Build is 64-bit only and requires Windows 64-bit)
    
    Changed locations of nsinstall.exe:
    Version <= 2.2.0: $(moz_build)/moztools/bin (32-bit)
    Version 3.0 - 3.1.1: $(moz_build)/msys/local/bin (64-bit only)
    Version >= 3.2: $(moz_build)/bin (64-bit only)

diff --git a/nss/makefile.mk b/nss/makefile.mk
index eb9aaa59214d..18c829bd1262 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -129,10 +129,9 @@ OS_TARGET=WIN95
 # make use of stlport headerfiles
 EXT_USE_STLPORT=TRUE
 
-#To build nss one has to call "make nss_build_all" in 
-#nss
+# To build nss one has to call "make nss_build_all" in nss
 NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/nss)
-BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
+BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/bin:$(moz_build)/msys/local/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
     -c "cd $(NSS_BUILD_DIR) && make nss_build_all NSS_DISABLE_GTESTS=1"
 
 OUT2LIB= \