From a34d75bd64a8c8edb886822cc8e22acaa376eef4 Mon Sep 17 00:00:00 2001 From: Stas Boukarev Date: Sat, 16 Sep 2017 21:44:41 +0300 Subject: [PATCH] make.sh: Fix time invocation. Can't invoke builtin utils from variables. --- make.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/make.sh b/make.sh index e5688d3e1..48623107f 100755 --- a/make.sh +++ b/make.sh @@ -69,12 +69,18 @@ $SBCL_XC_HOST < tools-for-build/canonicalize-whitespace.lisp || exit 1 # --host-location=user@host-machine: # and the make-target-*.sh scripts will take care of transferring the # necessary files. -TIME=`command -v time || true` -$TIME sh make-host-1.sh -$TIME sh make-target-1.sh -$TIME sh make-host-2.sh -$TIME sh make-target-2.sh -$TIME sh make-target-contrib.sh +maybetime() { + if command -v time > /dev/null ; then + time $@ + else + $@ + fi +} +maybetime sh make-host-1.sh +maybetime sh make-target-1.sh +maybetime sh make-host-2.sh +maybetime sh make-target-2.sh +maybetime sh make-target-contrib.sh NCONTRIBS=`find contrib -name Makefile -print | wc -l` NPASSED=`find obj/asdf-cache -name test-passed.test-report -print | wc -l`