diff options
Diffstat (limited to 'devtools/test-meson-builds.sh')
| -rwxr-xr-x | devtools/test-meson-builds.sh | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 9868c325..951c9067 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -10,6 +10,15 @@ srcdir=$(dirname $(readlink -m $0))/.. MESON=${MESON:-meson} +if command -v ninja >/dev/null 2>&1 ; then + ninja_cmd=ninja +elif command -v ninja-build >/dev/null 2>&1 ; then + ninja_cmd=ninja-build +else + echo "ERROR: ninja is not found" >&2 + exit 1 +fi + build () # <directory> <meson options> { builddir=$1 @@ -20,8 +29,8 @@ build () # <directory> <meson options> $MESON $options $srcdir $builddir unset CC fi - echo "ninja -C $builddir" - ninja -C $builddir + echo "$ninja_cmd -C $builddir" + $ninja_cmd -C $builddir } # shared and static linked builds with gcc and clang @@ -36,11 +45,16 @@ done build build-x86-default -Dmachine=nehalem # enable cross compilation if gcc cross-compiler is found -for f in config/arm/arm*gcc ; do - c=aarch64-linux-gnu-gcc - if ! command -v $c >/dev/null 2>&1 ; then - continue - fi - export CC="ccache $c" - build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) --cross-file $f -done +c=aarch64-linux-gnu-gcc +if command -v $c >/dev/null 2>&1 ; then + # compile the general v8a also for clang to increase coverage + export CC="ccache clang" + build build-arm64-host-clang --cross-file \ + config/arm/arm64_armv8_linuxapp_gcc + + for f in config/arm/arm*gcc ; do + export CC="ccache gcc" + build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) \ + --cross-file $f + done +fi |