From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 1 Aug 2019 20:47:23 +0000 (+0200)
Subject: smpicxx: obey the VERBOSE environment variable and display what we do
X-Git-Tag: v3.24~217
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/71af21fb892c4e4d6676b8ac14b836e59a1af4bc

smpicxx: obey the VERBOSE environment variable and display what we do
---

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index 2822fdbdd6..b8d6d401f9 100755
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -33,7 +33,7 @@ else
 fi
 
 # By default, we execute the commands instead of only showing them to cmake
-Show=
+show=
 
 list_set CMDARGS
 while [ $# -gt 0 ]; do
@@ -65,7 +65,7 @@ while [ $# -gt 0 ]; do
             ;;
 	'-show'|'-compile-info'|'-link-info')
             # Dry run displaying commands instead of executing them. Useful to cmake
-	    Show=echo
+	    show=1
 	    ;;
         *)
             list_add CMDARGS "${ARG}"
@@ -81,4 +81,8 @@ list_add_not_empty CMDLINE "${CMDARGS}"
 list_add_not_empty CMDLINE "${LINKARGS}"
 
 eval $(list_get CMDLINE)
-$Show "$@"
+if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then
+  echo "$@"
+  [ "x$show" = x1 ] && exit 0
+fi
+"$@"