Skip to content

Commit

Permalink
Fix the Makefile on Solaris
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
samcv committed Apr 10, 2018
1 parent d74f445 commit affeaa7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Configure.pl
Expand Up @@ -144,7 +144,8 @@
$config{'makefile-timing'} = $options{'makefile-timing'};
$config{'stagestats'} = '--stagestats' if $options{'makefile-timing'};
$config{'cpsep'} = $win ? ';' : ':';
$config{'shell'} = $win ? 'cmd' : 'sh';
my $shell = $^O eq 'MSWin32' ? 'cmd' : 'sh';
$config{'shell'} = $^O eq 'solaris' ? '' : "SHELL = $shell";
$config{'runner_suffix'} = $win ? '.bat' : '';

my $make = 'make';
Expand Down
2 changes: 1 addition & 1 deletion tools/build/Makefile-common-macros.in
Expand Up @@ -9,7 +9,7 @@ CP = @cp@
RM_F = @rm_f@
RM_RF = @rm_rf@
TEST_F = @test_f@
SHELL = @shell@
@shell@

SYSROOT= @sysroot@
SDKROOT= @sdkroot@
Expand Down

0 comments on commit affeaa7

Please sign in to comment.