Disable make cover if no gcov was found.

2 files changed, 12 insertions, 6 deletions

diff --git a/Makefile.in b/Makefile.in
index e6edd0d..5da4ace 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -121,9 +121,13 @@ infcover: infcover.o libz.a
         $(CC) $(CFLAGS) -coverage -o $@ infcover.o libz.a
 
 cover: infcover
+ifdef $(GCOV)
         rm -f *.gcda
         ${QEMU_RUN} ./infcover
         ${GCOV} ${LLVM_GCOV_FLAG} inf*.c -o ./infcover.gcda
+else
+        @echo 'cover disabled as no suitable gcov was found'
+endif
 
 libz.a: $(OBJS)
         $(AR) $(ARFLAGS) $@ $(OBJS)
diff --git a/configure b/configure
index 03a9e78..393c23c 100755
--- a/configure
+++ b/configure
@@ -200,25 +200,27 @@ esac
 
 if test "$clang" -eq 1; then
   if test "$cc" = "clang"; then
-    if `llvm-cov --version > /dev/null`; then
-      GCOV="llvm-cov-${clangV}"
+    if which -s llvm-cov; then
+      GCOV="llvm-cov"
+      LLVM_GCOV_FLAG="gcov"
+      GCOV="llvm-cov"
       LLVM_GCOV_FLAG="gcov"
+      echo "Using ${GCOV} for coverage"
     else
       cover=0
+      GCOV=""
       LLVM_GCOV_FLAG=""
       echo "Deactivating cover as no suitable gcov can be found"
     fi
-    GCOV="llvm-cov"
-    LLVM_GCOV_FLAG="gcov"
-    echo "Using ${GCOV} for coverage"
   else
     clangV=`echo "$cc" | sed -e 's/^.*-//'`
-    if `llvm-cov-${clangV} --version > /dev/null`; then
+    if which -s llvm-cov-${clangV}; then
       GCOV="llvm-cov-${clangV}"
       LLVM_GCOV_FLAG="gcov"
       echo "Using ${GCOV} for coverage"
     else
       cover=0
+      GCOV=""
       LLVM_GCOV_FLAG=""
       echo "Deactivating cover as no suitable gcov can be found"
     fi