diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/Module_solenv.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index 6b9f7d0f1a8c..89e40c6d43c0 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -29,7 +29,6 @@ $(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,\ @@ -39,7 +38,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\ endif endif endif -endif ifneq ($(COMPILER_PLUGINS),) ifeq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),) diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index 52c61b722ee6..f1707a488f43 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -24,10 +24,6 @@ ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),) -ifeq ($(MAKE_VERSION),3.81) -$(error make version 3.81 not supported for gbuildtojson; install newer make via LODE) -endif - # possibly recurse to ensure gbuildtojson was build before running the modded make gb_GbuildToJson_prep := $(shell $(MAKE) -f $(SRCDIR)/solenv/Makefile Executable_gbuildtojson) gb_FULLDEPS:= |