From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sat, 23 Oct 2021 07:02:58 +0000 (+0200)
Subject: Change nightly script to only print assembler if it is present.
X-Git-Tag: VALGRIND_3_19_0~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaf0525704e9344bfae8f923cc9f48a9d4d87484;p=thirdparty%2Fvalgrind.git

Change nightly script to only print assembler if it is present.

On FreeBSD 'as' is part of the optional 'binutils' packkage.
By default, clang uses its built-in assembler and 'as' is not
used.
---

diff --git a/nightly/bin/nightly b/nightly/bin/nightly
index 370a181114..3bd5986de8 100755
--- a/nightly/bin/nightly
+++ b/nightly/bin/nightly
@@ -185,13 +185,14 @@ END=`date "+%F %H:%M:%S %Z"`
 
 # Gather some information about this run and its environment
 valgrind_revision=$( ./valgrind-new/vg-in-place -v --version )
+as_version=""
 if  [ `uname -o` = "FreeBSD" ]; then
   gcc_version="`clang --version 2> /dev/null | head -1`"
 else
   gcc_version="`gcc --version 2> /dev/null | head -1`"
+  as_version="`as --version 2> /dev/null | head -1`"
 fi
 gdb_version="`gdb --version 2> /dev/null | head -1`"
-as_version="`as --version 2> /dev/null | head -1`"
 if [ `uname -o` = "Solaris" ]; then
   libc="Solaris libc"
 elif  [ `uname -o` = "FreeBSD" ]; then
@@ -222,7 +223,9 @@ fi
 echo "valgrind revision: $valgrind_revision" >  final
 echo "C compiler:        $gcc_version"       >> final
 echo "GDB:               $gdb_version"       >> final
-echo "Assembler:         $as_version"        >> final
+if [ -n "${as_version}" ] ; then
+   echo "Assembler:         $as_version"        >> final
+fi
 echo "C library:         $libc"              >> final
 echo "uname -mrs:        $uname_stuff"       >> final
 echo "Vendor version:    $vendor_stuff"      >> final