1 files changed, 18 insertions, 15 deletions

diff --git a/fuzz/build-coverage b/fuzz/build-coverage
index af9f8df..0f8310d 100755
--- a/fuzz/build-coverage
+++ b/fuzz/build-coverage
@@ -1,27 +1,30 @@
-#!/bin/bash -eux
-#
+#!/bin/sh -eux
+
 # Copyright (c) 2019 Yubico AB. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-LIBCBOR=$1
-LIBFIDO2=$2
+LIBCBOR="$1"
+LIBFIDO2="$2"
 
-CC=${CC:-clang}
-PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-${LIBCBOR}/install/lib/pkgconfig}
+CC="${CC:-clang}"
+CXX="${CXX:-clang++}"
+PKG_CONFIG_PATH="${PKG_CONFIG_PATH:-${LIBCBOR}/install/lib/pkgconfig}"
 export CC PKG_CONFIG_PATH
 
 # Clean up.
-rm -rf ${LIBCBOR}/build ${LIBCBOR}/install ${LIBFIDO2}/build
+rm -rf "${LIBCBOR}/build" "${LIBCBOR}/install" "${LIBFIDO2}/build"
 
 # Patch, build, and install libcbor.
-(cd ${LIBCBOR} && patch -N -l -s -p0 < ${LIBFIDO2}/fuzz/README) || true
-mkdir ${LIBCBOR}/build ${LIBCBOR}/install
-(cd ${LIBCBOR}/build && cmake -DCMAKE_INSTALL_PREFIX=${LIBCBOR}/install ..)
-make -C ${LIBCBOR}/build all install
+(cd "${LIBCBOR}" && patch -N -l -s -p0 < "${LIBFIDO2}/fuzz/README") || true
+mkdir "${LIBCBOR}/build" "${LIBCBOR}/install"
+(cd "${LIBCBOR}/build" && cmake -DCMAKE_INSTALL_PREFIX="${LIBCBOR}/install" ..)
+make -C "${LIBCBOR}/build" all install
 
 # Build libfido2.
-mkdir -p ${LIBFIDO2}/build
-(cd ${LIBFIDO2}/build && cmake -DFUZZ=1 -DLIBFUZZER=1 -DCOVERAGE=1 \
-        -DCMAKE_BUILD_TYPE=Debug ..)
-make -C ${LIBFIDO2}/build
+mkdir -p "${LIBFIDO2}/build"
+export CFLAGS="-fprofile-instr-generate -fcoverage-mapping"
+export LDFLAGS="${CFLAGS}"
+(cd "${LIBFIDO2}/build" && cmake -DFUZZ=1 -DLIBFUZZER=1 \
+    -DCMAKE_BUILD_TYPE=Debug ..)
+make -C "${LIBFIDO2}/build"