From: Thomas Monjalon <thomas@monjalon.net>
Date: Fri, 13 Sep 2019 07:26:27 +0000 (+0200)
Subject: devtools: fix check of ccache for meson build
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=54a88d1b16303bcb923773293ceb71d8c19a6403;p=dpdk.git

devtools: fix check of ccache for meson build

The meson build test fails if ccache is not available.
The use of ccache must be optional.
And if used, the compiler to check is the last word of $CC.

Fixes: e0ae780e6569 ("devtools: test compiler availability only once")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Luca Boccassi <bluca@debian.org>
---

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index a9d9360a6d..2eb9b23b07 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -28,6 +28,11 @@ 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
@@ -46,7 +51,7 @@ 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 ${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')
@@ -90,7 +95,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 +117,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