[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/gpgmepp

[Stephan Bergmann]

 external/gpgmepp/ExternalProject_gpgmepp.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 92a870beb088613722c0b1605927209e08b4bf0b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 27 15:25:03 2017 +0100

    Pass $(MAKE) into external/gpgmepp
    
    ...similar to e8e5bd65d31a60712afcab17d2e5f77c3322f86f "Pass $(MAKE) into
    external/libassuan"
    
    Change-Id: Icb90eb0831e74270a2600ab8ea9a6b0ac88a7e5f
    Reviewed-on: https://gerrit.libreoffice.org/45345
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit e75c983acfe0c496106ab1ef2a566408b8955cb8)
    Reviewed-on: https://gerrit.libreoffice.org/45374
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk
index 4b69774771fd..afd6ab6344f9 100644
--- a/external/gpgmepp/ExternalProject_gpgmepp.mk
+++ b/external/gpgmepp/ExternalProject_gpgmepp.mk
@@ -38,6 +38,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build):
 				$(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
 				$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
 		   --host=$(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) \
+		   MAKE=$(MAKE) \
 	  && $(MAKE) \
 	)
 else