X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=devtools%2Ftest-meson-builds.sh;h=fe11e3c0a11874ea862187dc3f069ac8e8f86216;hb=d6917418e4e92a1d4ac0198ffb622cdce9d782a9;hp=e3f19a01aa0f3d33d83e1c6cfd11ebdadfcadc8d;hpb=5d9176673008d585c707fb353596736601bbc5a3;p=dpdk.git

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index e3f19a01aa..fe11e3c0a1 100755
--- 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.
 
-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}
@@ -26,34 +28,42 @@ build () # <directory> <meson options>
 {
 	builddir=$1
 	shift
-	if [ ! -f "$builddir/build.ninja" ] ; then
-		options="--werror -Dexamples=all $*"
-		echo "$MESON $options $srcdir $builddir"
-		$MESON $options $srcdir $builddir
-		unset CC
-	fi
-	if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then
-		# for full output from ninja use "-v"
-		echo "$ninja_cmd -v -C $builddir"
-		$ninja_cmd -v -C $builddir
-	elif [ -n "$TEST_MESON_BUILD_VERBOSE" ] ; then
-		# for keeping the history of short cmds, pipe through cat
-		echo "$ninja_cmd -C $builddir | cat"
-		$ninja_cmd -C $builddir | cat
-	else
-		echo "$ninja_cmd -C $builddir"
-		$ninja_cmd -C $builddir
+	if command -v $CC >/dev/null 2>&1 ; then
+		if [ ! -f "$builddir/build.ninja" ] ; then
+			options="--werror -Dexamples=all $*"
+			echo "$MESON $options $srcdir $builddir"
+			$MESON $options $srcdir $builddir
+			unset CC
+		fi
+		if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then
+			# for full output from ninja use "-v"
+			echo "$ninja_cmd -v -C $builddir"
+			$ninja_cmd -v -C $builddir
+		elif [ -n "$TEST_MESON_BUILD_VERBOSE" ] ; then
+			# for keeping the history of short cmds, pipe through cat
+			echo "$ninja_cmd -C $builddir | cat"
+			$ninja_cmd -C $builddir | cat
+		else
+			echo "$ninja_cmd -C $builddir"
+			$ninja_cmd -C $builddir
+		fi
 	fi
 }
 
-if [ "$1" == "-vv" ] ; then
+if [ "$1" = "-vv" ] ; then
 	TEST_MESON_BUILD_VERY_VERBOSE=1
-elif [ "$1" == "-v" ] ; then
+elif [ "$1" = "-v" ] ; then
 	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
+	command -v $c >/dev/null 2>&1 || continue
 	for s in static shared ; do
 		export CC="ccache $c"
 		build build-$c-$s --default-library=$s
@@ -61,17 +71,22 @@ 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
 if command -v $c >/dev/null 2>&1 ; then
 	# compile the general v8a also for clang to increase coverage
-	export CC="ccache clang"
+	export CC="clang"
 	build build-arm64-host-clang $use_shared \
-		--cross-file config/arm/arm64_armv8_linux_gcc
+		--cross-file $srcdir/config/arm/arm64_armv8_linux_gcc
 
-	for f in config/arm/arm*gcc ; do
+	for f in $srcdir/config/arm/arm*gcc ; do
 		export CC="ccache gcc"
 		build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) \
 			$use_shared --cross-file $f