Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a8dd7b237056
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 87e543dad4c3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 28, 2020

  1. enable-coverage-instrumentation.sh: Fix unbound variable error 

    https://hydra.nixos.org/build/113299582
(cherry picked from commit 4c08214)
    @edolstra
    edolstra committed Feb 28, 2020
    Copy the full SHA
    87e543d View commit details
Showing with 1 addition and 12 deletions.
  1. +1 −12 pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
13 changes: 1 addition & 12 deletions pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
View file
Original file line number Diff line number Diff line change
@@ -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