devtools: fix cleanup of checkpatch temporary file

[dpdk.git] / devtools / test-meson-builds.sh

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index a9d9360..08e83eb 100755 (executable)
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -28,15 +28,24 @@ else
        echo "ERROR: ninja is not found" >&2
        exit 1
 fi
+if command -v ccache >/dev/null 2>&1 ; then
+       CCACHE=ccache
+else
+       CCACHE=
+fi
 
 default_path=$PATH
 default_pkgpath=$PKG_CONFIG_PATH
 
-reset_env ()
+load_env () # <target compiler>
 {
+       targetcc=$1
        export PATH=$default_path
        export PKG_CONFIG_PATH=$default_pkgpath
        unset DPDK_MESON_OPTIONS
+       command -v $targetcc >/dev/null 2>&1 || return 1
+       DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p')
+       . $srcdir/devtools/load-devel-config
 }
 
 build () # <directory> <target compiler> <meson options>
@@ -46,11 +55,8 @@ build () # <directory> <target compiler> <meson options>
        targetcc=$1
        shift
        # skip build if compiler not available
-       command -v $CC >/dev/null 2>&1 || return 0
-       command -v $targetcc >/dev/null 2>&1 || return 0
-       reset_env
-       DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p')
-       . $srcdir/devtools/load-devel-config
+       command -v ${CC##* } >/dev/null 2>&1 || return 0
+       load_env $targetcc || return 0
        if [ ! -f "$builddir/build.ninja" ] ; then
                options="--werror -Dexamples=all"
                for option in $DPDK_MESON_OPTIONS ; do
@@ -90,7 +96,7 @@ fi
 for c in gcc clang ; do
        command -v $c >/dev/null 2>&1 || continue
        for s in static shared ; do
-               export CC="ccache $c"
+               export CC="$CCACHE $c"
                build build-$c-$s $c --default-library=$s
        done
 done
@@ -112,7 +118,7 @@ build build-arm64-host-clang $c $use_shared \
        --cross-file $srcdir/config/arm/arm64_armv8_linux_gcc
 # all gcc/arm configurations
 for f in $srcdir/config/arm/arm*gcc ; do
-       export CC="ccache gcc"
+       export CC="$CCACHE gcc"
        build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) $c \
                $use_shared --cross-file $f
 done
@@ -123,6 +129,7 @@ build_path=build-x86-default
 export DESTDIR=$(pwd)/$build_path/install-root
 $ninja_cmd -C $build_path install
 
+load_env cc
 pc_file=$(find $DESTDIR -name libdpdk.pc)
 export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH