Support clang without version suffix for coverage testing.

2 months ago · 2408dedfa5
parent 121e4168b9
commit 2408dedfa5
1 changed files with 20 additions and 6 deletions
--- a/26
+++ b/26
@ -199,15 +199,29 @@ case `$cc -v 2>&1` in
 esac

 if test "$clang" -eq 1; then
-  clangV=`echo "$cc" | sed -e 's/^.*-//'`
-  if `llvm-cov-${clangV} --version > /dev/null`; then
-    GCOV="llvm-cov-${clangV}"
+  if test "$cc" = "clang"; then
+    if `llvm-cov --version > /dev/null`; then
+      GCOV="llvm-cov-${clangV}"
+      LLVM_GCOV_FLAG="gcov"
+    else
+      cover=0
+      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
-    cover=0
-    LLVM_GCOV_FLAG=""
-    echo "Deactivating cover as no suitable gcov can be found"
+    clangV=`echo "$cc" | sed -e 's/^.*-//'`
+    if `llvm-cov-${clangV} --version > /dev/null`; then
+      GCOV="llvm-cov-${clangV}"
+      LLVM_GCOV_FLAG="gcov"
+      echo "Using ${GCOV} for coverage"
+    else
+      cover=0
+      LLVM_GCOV_FLAG=""
+      echo "Deactivating cover as no suitable gcov can be found"
+    fi
  fi
 fi