Skip to content

Commit a609b56

Browse files
committed
Fix the build on Solaris
If SHELL is set `make` fails on Solaris with: mksh: Fatal error: Could not load Shell from `sh': Bad file number Remove it so it builds.
1 parent 7f4c1c2 commit a609b56

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Configure.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@
147147
}
148148
$config{'makefile-timing'} = $options{'makefile-timing'};
149149
$config{'stagestats'} = '--stagestats' if $options{'makefile-timing'};
150-
$config{'shell'} = $^O eq 'MSWin32' ? 'cmd' : 'sh';
150+
my $shell = $^O eq 'MSWin32' ? 'cmd' : 'sh';
151+
$config{'shell'} = $^O eq 'solaris' ? '' : "SHELL = $shell";
151152
$config{'bat'} = $^O eq 'MSWin32' ? '.bat' : '';
152153
$config{'cpsep'} = $^O eq 'MSWin32' ? ';' : ':';
153154
$config{'slash'} = $slash;

tools/build/Makefile-common.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ CHMOD = $(PERL) -MExtUtils::Command -e chmod
113113
CP = $(PERL) -MExtUtils::Command -e cp
114114
RM_RF = $(PERL) -MExtUtils::Command -e rm_rf
115115
RM_F = $(PERL) -MExtUtils::Command -e rm_f
116-
SHELL = @shell@
116+
@shell@
117117

118118
SYSROOT = @sysroot@
119119
PREFIX = @prefix@

0 commit comments

Comments
 (0)