Merge branch 'master' into xs
Conflicts: Build.PL
This commit is contained in:
commit
607fea3aa4
8
Build.PL
8
Build.PL
@ -69,8 +69,14 @@ EOF
|
|||||||
my %modules = (%prereqs, %recommends);
|
my %modules = (%prereqs, %recommends);
|
||||||
foreach my $module (sort keys %modules) {
|
foreach my $module (sort keys %modules) {
|
||||||
my $version = $modules{$module};
|
my $version = $modules{$module};
|
||||||
system $cpanm, "$module~$version";
|
if ($ENV{SLIC3R_NO_AUTO}) {
|
||||||
|
print "Missing prerequisite $module $version\n"
|
||||||
|
if !eval "use $module $version; 1";
|
||||||
|
} else {
|
||||||
|
system $cpanm, "$module~$version";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
exit if $ENV{SLIC3R_NO_AUTO};
|
||||||
system $cpanm, '--sudo', '--reinstall', './xs';
|
system $cpanm, '--sudo', '--reinstall', './xs';
|
||||||
|
|
||||||
if (eval "use App::Prove; 1") {
|
if (eval "use App::Prove; 1") {
|
||||||
|
Loading…
Reference in New Issue
Block a user