On 19/05/2021 20.45, Philippe Mathieu-Daudé wrote:
Add the $MAKE variable to call GNU make, and set it to 'gmake' on FreeBSD to avoid:$ make -j"$JOBS" make: Unknown modifier ',' make: "/builds/dTyar424/0/qemu/build/Makefile" line 3: Need an operator make: "/builds/dTyar424/0/qemu/build/Makefile" line 4: Missing dependency operator Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- .gitlab-ci.d/buildtest-template.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index fe4f18595ac..f284d7a0eec 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -5,9 +5,11 @@ ; then JOBS=$(sysctl -n hw.ncpu) + MAKE=gmake ; else JOBS=$(expr $(nproc) + 1) + MAKE=make
Maybe we could use "gmake" on Linux, too, so we do not have to use the indirection with a variable here? Or are there Linux distros where the "gmake" link is not available?
Thomas
