mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-27 01:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop using $run for anything other than testing compiled tests in Configure.

Browse Source 
When cross-compiling we want to run miniperl etc on the compile host, not the test target
This commit is contained in:
Jess Robinson 2012-12-29 21:29:50 +00:00 committed by Brian Fraser
parent b3f5e06d5a
commit d708ee4b2c
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.SH
View File

@ -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

13
make_ext.pl
View File

@ -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: $!";

2
utils/Makefile.PL
View File

@ -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

2
x2p/Makefile.SH
View File

@ -69,7 +69,7 @@ OPTIMIZE = $optimize
.SUFFIXES: .c \$(OBJ_EXT)
RUN = $run
RUN =
PERL = $perl
!GROK!THIS!