SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gitlab: use $MAKE instead of 'make'

Browse Source 
The lcitool generated containers have '$MAKE' set to the path
of the right 'make' binary. Using the env variable makes it
possible to override the choice per job.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240513111551.488088-3-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit c53f7a107879a2b7e719b07692a05289bf603fde)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Daniel P. Berrangé 2024-05-13 12:15:50 +01:00 committed by Michael Tokarev
parent 8fe634f851
commit d488e255be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.d/buildtest-template.yml
View File

@ -26,10 +26,10 @@
then then
pyvenv/bin/meson configure . -Dbackend_max_links="$LD_JOBS" ; pyvenv/bin/meson configure . -Dbackend_max_links="$LD_JOBS" ;
fi || exit 1; fi || exit 1;
- make -j"$JOBS" - $MAKE -j"$JOBS"
- if test -n "$MAKE_CHECK_ARGS"; - if test -n "$MAKE_CHECK_ARGS";
then then
make -j"$JOBS" $MAKE_CHECK_ARGS ; $MAKE -j"$JOBS" $MAKE_CHECK_ARGS ;
fi fi
- ccache --show-stats - ccache --show-stats
@ -60,7 +60,7 @@
- cd build - cd build
- find . -type f -exec touch {} + - find . -type f -exec touch {} +
# Avoid recompiling by hiding ninja with NINJA=":" # Avoid recompiling by hiding ninja with NINJA=":"
- make NINJA=":" $MAKE_CHECK_ARGS - $MAKE NINJA=":" $MAKE_CHECK_ARGS
.native_test_job_template: .native_test_job_template:
extends: .common_test_job_template extends: .common_test_job_template