From 0aa0d6ffbe9bf02c3179b7cb2b978d1896655e05 Mon Sep 17 00:00:00 2001 From: Tom Jones Date: Thu, 18 Jan 2024 10:48:17 +0000 Subject: build: Explicitly use gmake VPP requires GNU Make to build, on GNU systems (such as Debian), GNU Make is installed as 'make', typically with a symlink from 'gmake'. On other systems (such as FreeBSD), 'make' is a BSD Make derriviative and GNU Make is installed a 'gmake'. Use $(MAKE) variable for make calls from within Makefiles. This variable is set to the path of the calling make program, i.e., /usr/local/bin/gmake on a bsd system. This is the recommended way to call make from Makefiles in the GNU Make documentation. Type: improvement Change-Id: Id9162a34a0f8358f22090718087918dae31c0fce Signed-off-by: Tom Jones --- test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/Makefile b/test/Makefile index 7ea83acfff7..af503dcf59f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -107,7 +107,7 @@ $(PIP_TOOLS_INSTALL_DONE): $(PYTHON_DEPENDS): requirements.txt @bash -c "source $(VENV_PATH)/bin/activate && \ - CUSTOM_COMPILE_COMMAND='make test-refresh-deps (or update requirements.txt)' \ + CUSTOM_COMPILE_COMMAND='$(MAKE) test-refresh-deps (or update requirements.txt)' \ python3 -m piptools compile -q --generate-hashes requirements.txt --output-file $@" $(PIP_INSTALL_DONE): $(PIP_TOOLS_INSTALL_DONE) $(PYTHON_DEPENDS) @@ -379,7 +379,7 @@ cov-post: wipe-cov $(BUILD_COV_DIR) .PHONY: cov cov: - make -C . cov-prep test cov-post + $(MAKE) -C . cov-prep test cov-post .PHONY: wipe-cov wipe-cov: wipe -- cgit 1.2.3-korg