[Libreoffice-commits] core.git: solenv/Module_solenv.mk

[Michael Stahl]

 solenv/Module_solenv.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8cc747ad519ea203df4d77551b1b8c4d626a5618
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 13 13:22:06 2017 +0100

    solenv: don't run solenv_python test with make 3.81
    
    see 7a75b39273de47190b7a1fa20e0bcaca6d089033
    
    Change-Id: I575e5d5dc757cc054a49ae6596183f46373072f2

diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 127007e..528ac89 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,solenv,\
 endif
 
 ifneq ($(DISABLE_PYTHON),TRUE)
+ifneq ($(MAKE_VERSION),3.81) # gbuildtojson requires 3.82+
 ifneq ($(OS),WNT) # disable on Windows for now, causes gerrit/jenkins failures
 ifneq ($(OS),MACOSX) # disable on macOS too, fails at least for me and would be pointless anyway surely
 $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
@@ -32,6 +33,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
 endif
 endif
 endif
+endif
 
 ifneq ($(COMPILER_PLUGINS),)
 $(eval $(call gb_Module_add_check_targets,solenv, \