diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2013-02-27 12:37:42 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-27 15:26:18 +0100 |
| commit | 82f94df719fe9fe5a861eafb575ccb1f8b5b5efb (patch) | |
| tree | ae9ca85c54812ccd689a9e4841198428abbc9ef9 /pkgs/stdenv | |
| parent | 4417ffa2b50efd50fd79077dd924af7bc667eda9 (diff) | |
| download | nixlib-82f94df719fe9fe5a861eafb575ccb1f8b5b5efb.tar nixlib-82f94df719fe9fe5a861eafb575ccb1f8b5b5efb.tar.gz nixlib-82f94df719fe9fe5a861eafb575ccb1f8b5b5efb.tar.bz2 nixlib-82f94df719fe9fe5a861eafb575ccb1f8b5b5efb.tar.lz nixlib-82f94df719fe9fe5a861eafb575ccb1f8b5b5efb.tar.xz nixlib-82f94df719fe9fe5a861eafb575ccb1f8b5b5efb.tar.zst nixlib-82f94df719fe9fe5a861eafb575ccb1f8b5b5efb.zip | |
stdenv/setup.sh: Always run postPatch hook.
I'm not sure whether this was by intention, but so far postPatch hooks were silently skipped whenever the patches list was empty. This change could possibly change the build results of the following packages: * gcc * cmake (264) * systemtap * quemu-kvm These packages all have in common that they have a postPatch hook and the patches list can be empty when certain conditions are met. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 2 | ||||
| -rwxr-xr-x | pkgs/stdenv/mingw/setup.sh | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index c5722c3e8749..a474b6a8eaf1 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -530,8 +530,6 @@ unpackPhase() { patchPhase() { runHook prePatch - if [ -z "$patchPhase" -a -z "$patches" ]; then return; fi - for i in $patches; do header "applying patch $i" 3 local uncompress=cat diff --git a/pkgs/stdenv/mingw/setup.sh b/pkgs/stdenv/mingw/setup.sh index 4de3c0ddc9b4..592580a829e3 100755 --- a/pkgs/stdenv/mingw/setup.sh +++ b/pkgs/stdenv/mingw/setup.sh @@ -486,9 +486,7 @@ unpackPhase() { patchPhase() { runHook prePatch - - if test -z "$patchPhase" -a -z "$patches"; then return; fi - + for i in $patches; do header "applying patch $i" 3 local uncompress=cat |