summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2012-03-19 12:48:31 +0100
committerNicholas Clark <nick@ccl4.org>2012-03-19 21:54:41 +0100
commitc34d842973a74ded7d9fae683eaa8645afa9d6bb (patch)
tree9d8f84bd1740ac3f30d70e7ad94a06fd3be451e8
parent5d0b49e8365d66ddadfdd132c33441717b9f1485 (diff)
downloadperl-c34d842973a74ded7d9fae683eaa8645afa9d6bb.tar.gz
bisect-runner.pl should detect ccache with -V, not --version
ccache 2.4 doesn't support the --version parameter, only -V. ccache 3 supports both.
-rwxr-xr-xPorting/bisect-runner.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl
index f0cc795669..3e49f157f9 100755
--- a/Porting/bisect-runner.pl
+++ b/Porting/bisect-runner.pl
@@ -519,11 +519,11 @@ die "$0: Can't build $target" if defined $target && !grep {@targets} $target;
unless (exists $defines{cc}) {
# If it fails, the heuristic of 63f9ec3008baf7d6 is noisy, and hence
- # confusing. Additionally, it doesn't correctly cope with ccache 2.4
+ # confusing.
# FIXME - really it should be replaced with a proper test of
# "can we build something?" and a helpful diagnostic if we can't.
# For now, simply move it here.
- $defines{cc} = (`ccache --version`, $?) ? 'cc' : 'ccache cc';
+ $defines{cc} = (`ccache -V`, $?) ? 'cc' : 'ccache cc';
}
$j = "-j$j" if $j =~ /\A\d+\z/;