aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatias Elo <matias.elo@nokia.com>2019-01-29 11:13:55 +0200
committerMaxim Uvarov <maxim.uvarov@linaro.org>2019-01-29 22:42:48 +0300
commit161475395cda3ca50861f7ffd0fe73334217c563 (patch)
tree1ddc9e197171f4c79dcc85044ed598381a48d68f
parent8e398e1f745a1674a2bcca4f39ea8784e5003c0e (diff)
Port 3a9cf94b7 "linux-gen: fix compiling dpdk pktio with Clang"v1.21.0.0_DPDK_17.11
Signed-off-by: Matias Elo <matias.elo@nokia.com> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
-rw-r--r--platform/linux-dpdk/m4/configure.m41
-rwxr-xr-xscripts/ci/build_x86_64.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4
index ad48c809e..d7062c24e 100644
--- a/platform/linux-dpdk/m4/configure.m4
+++ b/platform/linux-dpdk/m4/configure.m4
@@ -43,6 +43,7 @@ case "${host}" in
;;
esac
+ODP_CHECK_CFLAG([-Wno-error=cast-align])
AC_DEFINE([ODP_PKTIO_DPDK], [1])
AC_CONFIG_COMMANDS_PRE([dnl
AM_CONDITIONAL([PLATFORM_IS_LINUX_DPDK],
diff --git a/scripts/ci/build_x86_64.sh b/scripts/ci/build_x86_64.sh
index c4dd1f4ea..115c0bf26 100755
--- a/scripts/ci/build_x86_64.sh
+++ b/scripts/ci/build_x86_64.sh
@@ -4,6 +4,7 @@ set -e
export TARGET_ARCH=x86_64-linux-gnu
if [ "${CC#clang}" != "${CC}" ] ; then
export CXX="clang++"
+ sed -i 's/ODP_CHECK_CFLAG(\[\-Wcast-align\])/#ODP_CHECK_CFLAG(\[\-Wcast-align\])/g' /odp/configure.ac
fi
exec "$(dirname "$0")"/build.sh