aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVollstrecker <werner@vollstreckernet.de>2024-12-25 18:52:44 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-01-31 20:01:41 -0800
commite677f1f1c71231ba1befb9da6ed02b6db38dedc3 (patch)
treea6b3e4edf382720a8d8984feed82a96d7074cb77
parent039c3610e5fce300b2dd5a335394677b131512b5 (diff)
downloadzlib-e677f1f1c71231ba1befb9da6ed02b6db38dedc3.tar.gz
zlib-e677f1f1c71231ba1befb9da6ed02b6db38dedc3.tar.bz2
zlib-e677f1f1c71231ba1befb9da6ed02b6db38dedc3.zip
Disable make cover if no gcov was found.
-rw-r--r--Makefile.in4
-rwxr-xr-xconfigure14
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
121 $(CC) $(CFLAGS) -coverage -o $@ infcover.o libz.a 121 $(CC) $(CFLAGS) -coverage -o $@ infcover.o libz.a
122 122
123cover: infcover 123cover: infcover
124ifdef $(GCOV)
124 rm -f *.gcda 125 rm -f *.gcda
125 ${QEMU_RUN} ./infcover 126 ${QEMU_RUN} ./infcover
126 ${GCOV} ${LLVM_GCOV_FLAG} inf*.c -o ./infcover.gcda 127 ${GCOV} ${LLVM_GCOV_FLAG} inf*.c -o ./infcover.gcda
128else
129 @echo 'cover disabled as no suitable gcov was found'
130endif
127 131
128libz.a: $(OBJS) 132libz.a: $(OBJS)
129 $(AR) $(ARFLAGS) $@ $(OBJS) 133 $(AR) $(ARFLAGS) $@ $(OBJS)
diff --git a/configure b/configure
index 03a9e78..393c23c 100755
--- a/configure
+++ b/configure
@@ -200,25 +200,27 @@ esac
200 200
201if test "$clang" -eq 1; then 201if test "$clang" -eq 1; then
202 if test "$cc" = "clang"; then 202 if test "$cc" = "clang"; then
203 if `llvm-cov --version > /dev/null`; then 203 if which -s llvm-cov; then
204 GCOV="llvm-cov-${clangV}" 204 GCOV="llvm-cov"
205 LLVM_GCOV_FLAG="gcov"
206 GCOV="llvm-cov"
205 LLVM_GCOV_FLAG="gcov" 207 LLVM_GCOV_FLAG="gcov"
208 echo "Using ${GCOV} for coverage"
206 else 209 else
207 cover=0 210 cover=0
211 GCOV=""
208 LLVM_GCOV_FLAG="" 212 LLVM_GCOV_FLAG=""
209 echo "Deactivating cover as no suitable gcov can be found" 213 echo "Deactivating cover as no suitable gcov can be found"
210 fi 214 fi
211 GCOV="llvm-cov"
212 LLVM_GCOV_FLAG="gcov"
213 echo "Using ${GCOV} for coverage"
214 else 215 else
215 clangV=`echo "$cc" | sed -e 's/^.*-//'` 216 clangV=`echo "$cc" | sed -e 's/^.*-//'`
216 if `llvm-cov-${clangV} --version > /dev/null`; then 217 if which -s llvm-cov-${clangV}; then
217 GCOV="llvm-cov-${clangV}" 218 GCOV="llvm-cov-${clangV}"
218 LLVM_GCOV_FLAG="gcov" 219 LLVM_GCOV_FLAG="gcov"
219 echo "Using ${GCOV} for coverage" 220 echo "Using ${GCOV} for coverage"
220 else 221 else
221 cover=0 222 cover=0
223 GCOV=""
222 LLVM_GCOV_FLAG="" 224 LLVM_GCOV_FLAG=""
223 echo "Deactivating cover as no suitable gcov can be found" 225 echo "Deactivating cover as no suitable gcov can be found"
224 fi 226 fi