diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 7f1be392544..c505473ee72 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -96,11 +96,11 @@ sub findFiles { } unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) { - if ($checkCollisionContents && checkCollision($oldTarget, $target)) { - return; - } elsif ($ignoreCollisions) { + if ($ignoreCollisions) { warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1; return; + } elsif ($checkCollisionContents && checkCollision($oldTarget, $target)) { + return; } else { die "collision between `$target' and `$oldTarget'\n"; }