[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann (via logerrit)]

 external/nss/ExternalProject_nss.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eac806e8dcd9ee6439ac8695978ff6b62cc6b8d2
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Mar 25 12:04:57 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Mar 25 14:52:05 2020 +0100

    Properly quote $(NINJA)
    
    At least on my Windows machine I had always had
    
      C:\Program Files (x86)\Ninja 1.7.1
    
    in Path, so that `which ninja` in configure.ac puts
    
      export NINJA=/cygdrive/c/Program Files (x86)/Ninja 1.7.1/ninja
    
    into config_host.mk, with spaces and parentheses that need to be quoted here.
    
    Change-Id: I938f8914cbc9b7eff7a41009f12cd95abeb4421c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91042
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index e39f1449df64..28e2476c5c8c 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
 			COMMA=$(COMMA) \
 			PATH=$$(cygpath $(call gb_UnpackedTarball_get_dir,nss)):$$(cygpath $(call gb_UnpackedTarball_get_dir,gyp)):$$PATH \
 			MAKE=$(MAKE) \
-			NINJA=$(NINJA) \
+			NINJA='$(subst ','\'',$(NINJA))' \
 			NSINSTALL='$(SRCDIR)/external/nss/nsinstall.py' \
 			LIB="$(ILIB)" \
 			RC="rc.exe $(SOLARINC)" \
@@ -70,7 +70,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
 	$(call gb_ExternalProject_run,build,\
 			COMMA=$(COMMA) \
 			PATH=$(call gb_UnpackedTarball_get_dir,nss):$(call gb_UnpackedTarball_get_dir,gyp):$$PATH \
-			NINJA=$(NINJA) \
+			NINJA='$(subst ','\'',$(NINJA))' \
 			./build.sh -v --disable-tests --enable-libpkix \
 				$(if $(ENABLE_DBGUTIL),,--opt) \
 				$(if $(COM_IS_CLANG),$(if $(filter -fsanitize=%,$(CC)),--no-zdefs)) \