summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJess Robinson <castaway@desert-island.me.uk>2012-12-29 21:29:50 +0000
committerBrian Fraser <fraserbn@gmail.com>2014-01-22 13:08:19 -0300
commitd708ee4b2cf817d9803f6f18f87d6ce91ca74ff4 (patch)
treea3cf4079273544ab17eca72786623bad7fcce7ab
parentb3f5e06d5ac6935e10a18f3dcb6e437fb2861500 (diff)
downloadperl-d708ee4b2cf817d9803f6f18f87d6ce91ca74ff4.tar.gz
Stop using $run for anything other than testing compiled tests in Configure.
When cross-compiling we want to run miniperl etc on the compile host, not the test target
-rwxr-xr-xMakefile.SH2
-rw-r--r--make_ext.pl13
-rw-r--r--utils/Makefile.PL2
-rwxr-xr-xx2p/Makefile.SH2
4 files changed, 8 insertions, 11 deletions
diff --git a/Makefile.SH b/Makefile.SH
index 9e55e65a0f..6bb91cc257 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -302,7 +302,7 @@ STATIC_LDFLAGS = $static_ldflags
LDLIBPTH = $ldlibpth
# Sometimes running an executable is an adventure.
-RUN = $run
+RUN =
# These variables may need to be manually set for non-Unix systems.
AR = $full_ar
diff --git a/make_ext.pl b/make_ext.pl
index 885322f442..c857130a15 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -120,9 +120,6 @@ unless(defined $makecmd and $makecmd =~ /^MAKE=(.*)$/) {
# names, but neither did what it replaced. Once there is a use case that needs
# it, please supply patches. Until then, I'm sticking to KISS
my @make = split ' ', $1 || $Config{make} || $ENV{MAKE};
-# Using an array of 0 or 1 elements makes the subsequent code simpler.
-my @run = $Config{run};
-@run = () if not defined $run[0] or $run[0] eq '';
if ($target eq '') {
@@ -464,8 +461,8 @@ EOM
}
push @args, @$pass_through;
_quote_args(\@args) if $is_VMS;
- print join(' ', @run, $perl, @args), "\n";
- my $code = system @run, $perl, @args;
+ print join(' ', $perl, @args), "\n";
+ my $code = system $perl, @args;
warn "$code from $ext_dir\'s Makefile.PL" if $code;
# Right. The reason for this little hack is that we're sitting inside
@@ -521,11 +518,11 @@ EOS
# Give makefile an opportunity to rewrite itself.
# reassure users that life goes on...
my @args = ('config', @$pass_through);
- system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n";
+ system(@make, @args) and print "@make @args failed, continuing anyway...\n";
}
my @targ = ($target, @$pass_through);
- print "Making $target in $ext_dir\n@run @make @targ\n";
- my $code = system(@run, @make, @targ);
+ print "Making $target in $ext_dir\n@make @targ\n";
+ my $code = system(@make, @targ);
die "Unsuccessful make($ext_dir): code=$code" if $code != 0;
chdir $return_dir || die "Cannot cd to $return_dir: $!";
diff --git a/utils/Makefile.PL b/utils/Makefile.PL
index c5e3694b8a..8e461d41eb 100644
--- a/utils/Makefile.PL
+++ b/utils/Makefile.PL
@@ -26,7 +26,7 @@ my $perl = defined $Config{usedl} ? '../miniperl' : '../perl';
print $fh <<"EOT";
PERL = $perl
REALPERL = ../perl
-RUN = $Config{run} # Used mainly cross-compilation setups.
+RUN = # Used mainly cross-compilation setups.
EOT
diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index ae017b6436..2e554014c5 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -69,7 +69,7 @@ OPTIMIZE = $optimize
.SUFFIXES: .c \$(OBJ_EXT)
-RUN = $run
+RUN =
PERL = $perl
!GROK!THIS!