diff options
| author | Nicholas Clark <nick@ccl4.org> | 2012-04-12 21:50:11 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2013-05-28 09:19:28 +0200 |
| commit | 67bec9384212c1d341abd37024333ae3aa8a8f6d (patch) | |
| tree | 055d59539b1b4f41860e308617fcc86ed1533cd5 /Porting | |
| parent | df14fc1356c4b115f6728bf48e976bd98e8c29b0 (diff) | |
| download | perl-67bec9384212c1d341abd37024333ae3aa8a8f6d.tar.gz | |
bisect-runner.pl should fix Makefile.SH to remove remove GNU make-isms.
Commit c7b956bbbaff0c46 inadvertently added a GNU (and BSD) make specific
construction to the *nix Makefile, which other platforms' makes choke on.
It was corrected with commit cfe76a0a8e5b6f21 (and 0961731461727bea), but
those changes are not the simplest way to get things passing again, so use
a simpler custom patch here.
Diffstat (limited to 'Porting')
| -rwxr-xr-x | Porting/bisect-runner.pl | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl index 246d62ace6..95da68ee53 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -2046,6 +2046,29 @@ index f61d0db..6097954 100644 EOPATCH } + if ($major == 15 && $^O !~ /^(linux|darwin|.*bsd)$/ + && extract_from_file('Makefile.SH', qr/^V.* \?= /)) { + # Remove the GNU-make-ism (which the BSD makes also support, but + # most other makes choke on) + apply_patch(<<'EOPATCH'); +diff --git a/Makefile.SH b/Makefile.SH +index 94952bd..13e9001 100755 +--- a/Makefile.SH ++++ b/Makefile.SH +@@ -338,8 +338,8 @@ linux*|darwin) + $spitshell >>$Makefile <<!GROK!THIS! + # If you're going to use valgrind and it can't be invoked as plain valgrind + # then you'll need to change this, or override it on the make command line. +-VALGRIND ?= valgrind +-VG_TEST ?= ./perl -e 1 2>/dev/null ++VALGRIND = valgrind ++VG_TEST = ./perl -e 1 2>/dev/null + + !GROK!THIS! + ;; +EOPATCH + } + if ($major == 11) { if (extract_from_file('patchlevel.h', qr/^#include "unpushed\.h"/)) { |