Skip to content

Commit 6536aa7

Browse files
committed
Merge pull request #248 from Perl-Toolchain-Gang/win32_gmake_echo_t
t/echo.t needs SHELL env for Win32 gmake
2 parents c5ae513 + ae56bdd commit 6536aa7

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

t/echo.t

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ $mm->init_tools; # need ECHO
3333
# Run Perl with the currently installing MakeMaker
3434
$mm->{$_} .= q[ "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"] for qw( PERLRUN FULLPERLRUN ABSPERLRUN );
3535

36+
#see sub specify_shell
37+
my $shell = $^O eq 'MSWin32' && $mm->is_make_type('gmake') ? $ENV{COMSPEC} : undef;
38+
3639
#------------------- Testing functions
3740

3841
sub test_for_echo {
@@ -53,6 +56,7 @@ sub test_for_echo {
5356
for my $key (qw(INST_ARCHLIB INST_LIB PERL ABSPERL ABSPERLRUN ECHO)) {
5457
print $makefh "$key=$mm->{$key}\n";
5558
}
59+
print $makefh "SHELL=$shell\n" if defined $shell;
5660

5761
print $makefh "all :\n";
5862
for my $args (@$calls) {

0 commit comments

Comments
 (0)