Check that the build starts with the right make version
Can be a problem on macOS - where the 'make' is version is too old for gbuild. Change-Id: I1039072a2c36b9f960467176118bce457732f0b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194560 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Stahl <michael.stahl@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196845 Tested-by: Tor Lillqvist <tml@iki.fi> Reviewed-by: Tor Lillqvist <tml@iki.fi>
This commit is contained in:
committed by
Tor Lillqvist
parent
e6c057d045
commit
c48d2cff99
+10
-2
@@ -9,7 +9,7 @@
|
||||
|
||||
gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
|
||||
|
||||
.PHONY : check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo coverage internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
|
||||
.PHONY : check-if-root check-makefile-version bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo coverage internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
|
||||
|
||||
MAKECMDGOALS?=build
|
||||
build_goal:=$(if $(filter build uicheck,$(MAKECMDGOALS)),build)\
|
||||
@@ -78,6 +78,14 @@ check-if-root:
|
||||
fi \
|
||||
fi
|
||||
|
||||
check-makefile-version:
|
||||
@if awk 'BEGIN {exit ($(MAKE_VERSION) >= 4.0) ;}' ; then \
|
||||
echo; \
|
||||
echo "Running with make $(MAKE_VERSION) is likely to cause problems, try with $$GNUMAKE instead."; \
|
||||
echo; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
gb_Side ?= host
|
||||
|
||||
include $(BUILDDIR)/config_$(gb_Side).mk
|
||||
@@ -289,7 +297,7 @@ endif
|
||||
#
|
||||
# Bootstrap
|
||||
#
|
||||
bootstrap: check-if-root compilerplugins
|
||||
bootstrap: check-if-root check-makefile-version compilerplugins
|
||||
|
||||
#
|
||||
# Build
|
||||
|
||||
Reference in New Issue
Block a user