From: Thomas Monjalon <thomas@monjalon.net>
To: bruce.richardson@intel.com
Cc: bluca@debian.org, dev@dpdk.org
Subject: [dpdk-dev] [PATCH] devtools: fix check of ccache for meson build
Date: Fri, 13 Sep 2019 09:34:25 +0200 [thread overview]
Message-ID: <20190913073425.13363-1-thomas@monjalon.net> (raw)
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>
---
This script is failing now because a real check of ccache availability
is done in commit e0ae780e6569.
It was not failing before, which means $CC is not used by meson?
---
devtools/test-meson-builds.sh | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index a9d9360a6..2eb9b23b0 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
--
2.23.0
next reply other threads:[~2019-09-13 7:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-13 7:34 Thomas Monjalon [this message]
2019-09-13 9:46 ` Luca Boccassi
2019-09-13 10:33 ` Thomas Monjalon
2019-09-13 9:54 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190913073425.13363-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=bluca@debian.org \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).