From 2660c6f653c11fa37f3385b9f5777f1eff6489c8 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 10 Apr 2019 21:52:23 +0100 Subject: [PATCH] devtools: support older compilers with meson test Older versions of GCC, such as on Redhat/CentOS 7, don't support -march=nehalem, but need -march=corei7 instead. Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- devtools/test-meson-builds.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 9a67cfa643..c7bde2fb79 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -62,7 +62,12 @@ for c in gcc clang ; do done # test compilation with minimal x86 instruction set -build build-x86-default -Dmachine=nehalem $use_shared +default_machine='nehalem' +ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false) +if [ "$ok" = "false" ] ; then + default_machine='corei7' +fi +build build-x86-default -Dmachine=$default_machine $use_shared # enable cross compilation if gcc cross-compiler is found c=aarch64-linux-gnu-gcc -- 2.20.1