diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-14 14:49:31 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-14 14:49:31 +0000 |
commit | 9183f21f7e005b9229b615e65fa463733267ce96 (patch) | |
tree | 9155247a14d60982c3f4be514e386a976f7240d3 /pkgs/stdenv/adapters.nix | |
parent | c161cd1773e6411054047b1dd2a9544b0b05b0d1 (diff) | |
parent | c63858a16919de0f929d8377ce616e93a99f2074 (diff) |
Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
-rw-r--r-- | pkgs/stdenv/adapters.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 5718d06c45d29..5b37f9908c245 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -200,12 +200,17 @@ rec { # Get rid of everything that isn't a gcno file or a C source # file. This also includes the gcda files; we're not # interested in coverage resulting from the package's own test - # suite. + # suite. Also strip the `.tmp_' prefix from gcno files. (The + # Linux kernel creates these.) cleanupBuildDir = '' find $out/.build/ -type f -a ! \ \( -name "*.c" -o -name "*.h" -o -name "*.gcno" \) \ | xargs rm -f -- + + for i in $(find $out/.build/ -name ".tmp_*.gcno"); do + mv "$i" "$(echo $i | sed s/.tmp_//)" + done ''; } stdenv; |