Skip to content
Permalink
Browse files

Fixed nqp checkout and build

  • Loading branch information...
vrurg committed Apr 4, 2019
1 parent d54fafc commit 2c256531d2be3e854c3533caf4fec016d5a45261
Showing with 6 additions and 5 deletions.
  1. +1 −0 tools/lib/NQP/Config.pm
  2. +5 −5 tools/lib/NQP/Config/Rakudo.pm
@@ -740,6 +740,7 @@ sub git_checkout {
push @args, "--depth=$options->{'git-depth'}"
if $options->{'git-depth'};
push @args, $pullurl, $dir;
print "Cloning from $pullurl\n";
system_or_die(@args);
chdir($dir);

@@ -4,7 +4,7 @@ use warnings;

package NQP::Config::Rakudo;
use Cwd;
use NQP::Config qw<slurp nfp read_config cmp_rev>;
use NQP::Config qw<slurp nfp read_config cmp_rev system_or_die>;

use base qw<NQP::Config>;

@@ -315,6 +315,7 @@ sub gen_nqp {
my $config = $self->config;

my $nqp_bin = $options->{'with-nqp'};
my $nqp_git_spec = $options->{'gen-nqp'};
my $gen_nqp = defined $options->{'gen-nqp'};
my $gen_moar = $options->{'gen-moar'};
my $prefix = $config->{'prefix'};
@@ -356,16 +357,15 @@ sub gen_nqp {

if ( defined $gen_nqp || defined $gen_moar ) {
my $user = $options->{'github-user'} // 'perl6';
$self->git_checkout( 'nqp', 'nqp', $gen_nqp || $nqp_want );
$self->git_checkout( 'nqp', 'nqp', $nqp_git_spec || $nqp_want );
}

return unless defined($gen_nqp) || defined($gen_moar);

my $backends = join ",", $self->active_backends;
my @cmd = (
$^X, 'Configure.pl', "--prefix=$prefix",
"--backends=$backends", "--make-install",
"--git-protocol=$git_protocol",
$^X, 'Configure.pl', "--prefix=$prefix", "--backends=$backends",
"--make-install", "--git-protocol=$git_protocol",
);

for my $opt (qw<git-depth git-reference github-user nqp-repo moar-repo>) {

0 comments on commit 2c25653

Please sign in to comment.
You can’t perform that action at this time.