git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnx2x: fix interrupt flood
[dpdk.git]
/
devtools
/
test-meson-builds.sh
diff --git
a/devtools/test-meson-builds.sh
b/devtools/test-meson-builds.sh
index
9a67cfa
..
630a1a6
100755
(executable)
--- a/
devtools/test-meson-builds.sh
+++ b/
devtools/test-meson-builds.sh
@@
-7,7
+7,9
@@
# * if a build-directory already exists we assume it was properly configured
# Run ninja after configuration is done.
# * if a build-directory already exists we assume it was properly configured
# Run ninja after configuration is done.
-set -o pipefail
+# set pipefail option if possible
+PIPEFAIL=""
+set -o | grep -q pipefail && set -o pipefail && PIPEFAIL=1
srcdir=$(dirname $(readlink -f $0))/..
MESON=${MESON:-meson}
srcdir=$(dirname $(readlink -f $0))/..
MESON=${MESON:-meson}
@@
-46,11
+48,16
@@
build () # <directory> <meson options>
fi
}
fi
}
-if [ "$1" =
=
"-vv" ] ; then
+if [ "$1" = "-vv" ] ; then
TEST_MESON_BUILD_VERY_VERBOSE=1
TEST_MESON_BUILD_VERY_VERBOSE=1
-elif [ "$1" =
=
"-v" ] ; then
+elif [ "$1" = "-v" ] ; then
TEST_MESON_BUILD_VERBOSE=1
fi
TEST_MESON_BUILD_VERBOSE=1
fi
+# we can't use plain verbose when we don't have pipefail option so up-level
+if [ -z "$PIPEFAIL" -a -n "$TEST_MESON_BUILD_VERBOSE" ] ; then
+ echo "# Missing pipefail shell option, changing VERBOSE to VERY_VERBOSE"
+ TEST_MESON_BUILD_VERY_VERBOSE=1
+fi
# shared and static linked builds with gcc and clang
for c in gcc clang ; do
# shared and static linked builds with gcc and clang
for c in gcc clang ; do
@@
-62,7
+69,12
@@
for c in gcc clang ; do
done
# test compilation with minimal x86 instruction set
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
# enable cross compilation if gcc cross-compiler is found
c=aarch64-linux-gnu-gcc