From 8b7cb13eb2d7b3934a592b9c62fcde59e8d7b2d1 Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Fri, 28 Oct 2011 16:13:18 +0200 Subject: [PATCH] Remove unnecessary makefile fix-up code from bisect-runner.pl As it always uses blead's version of makedepend, there's no need to correct makefile and x2p/makefile for mistakes left by earlier versions of makedepend. --- Porting/bisect-runner.pl | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl index 461c339..4af93dc 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -1095,6 +1095,8 @@ if ($major == 7) { # There was a bug in makedepend.SH which was fixed in version 96a8704c. # Symptom was './makedepend: 1: Syntax error: Unterminated quoted string' # Remove this if you're actually bisecting a problem related to makedepend.SH +# If you do this, you may need to add in code to correct the output of older +# makedepends, which don't correctly filter newer gcc output such as checkout_file('makedepend.SH'); if ($^O eq 'freebsd') { @@ -1808,16 +1810,6 @@ if (@missing) { if @errors; } -# Correct makefile for newer GNU gcc -# Only really needed if you comment out the use of blead's makedepend.SH -{ - local $^I = ""; - local @ARGV = qw(makefile x2p/makefile); - while (<>) { - print unless /<(?:built-in|command|stdin)/; - } -} - if ($major == 2 && extract_from_file('perl.c', qr/^ fclose\(e_fp\);$/)) { # need to patch perl.c to avoid calling fclose() twice on e_fp when using -e # This diff is part of commit ab821d7fdc14a438. The second close was -- 2.7.4