From 4c0821461e1e3b7615b9fb894325ce7169b3075b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2020 12:31:50 +0100 Subject: [PATCH] enable-coverage-instrumentation.sh: Fix unbound variable error https://hydra.nixos.org/build/113299582 --- .../setup-hooks/enable-coverage-instrumentation.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh index 7175b408b02..2b48fea4ff0 100644 --- a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh +++ b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh @@ -2,18 +2,7 @@ postPhases+=" cleanupBuildDir" # Force GCC to build with coverage instrumentation. Also disable # optimisation, since it may confuse things. -export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage" - -# FIXME: Handle the case where postUnpack is already set. -postUnpack() { - # This is an uberhack to prevent libtool from remoaving gcno - # files. This has been fixed in libtool, but there are packages - # out there with old ltmain.sh scripts. See - # http://www.mail-archive.com/libtool@gnu.org/msg10725.html - for i in $(find -name ltmain.sh); do - substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)' - done -} +export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE:-} -O0 --coverage" # Get rid of everything that isn't a gcno file or a C source file. # Also strip the `.tmp_' prefix from gcno files. (The Linux kernel