public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making the addCoverageInformation stdenv adapter better in the sense that it

Browse Source 
does not override NIX_CFLAGS_COMPILE anymore in the mkDerivation parameter
attributes. This way, apacheHttpd can be built properly with coverage
information.
An indication of this problem came from the nixos tests.subversion failure.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24938
This commit is contained in:
Lluís Batlle i Rossell 2010-11-30 14:10:52 +00:00
parent f7cfcbd1f9
commit 0196bb720e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/stdenv/adapters.nix
View File

@ -242,17 +242,18 @@ rec {
*/ */
addCoverageInstrumentation = stdenv: addCoverageInstrumentation = stdenv:
addAttrsToDerivation addAttrsToDerivation
{ NIX_CFLAGS_COMPILE = "-O0 --coverage"; {
# This is an uberhack to prevent libtool from removing 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
postUnpack = postUnpack =
'' ''
# This is an uberhack to prevent libtool from removing 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 for i in $(find -name ltmain.sh); do
substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)' substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)'
done done
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage"
''; '';
} }