Skip to content
Permalink
Browse files

Support for latest changes in nqp-configure

OpenBSD and command line options improvements.
  • Loading branch information...
vrurg committed May 17, 2019
1 parent 7a7a23d commit adc8e2123e96dd7aea404fa86d10b0c7dbec25bd
Showing with 10 additions and 31 deletions.
  1. +1 −1 3rdparty/nqp-configure
  2. +1 −1 Configure.pl
  3. +8 −29 tools/lib/NQP/Config/Rakudo.pm
@@ -56,7 +56,7 @@ BEGIN
'prefix=s', 'libdir=s',
'sysroot=s', 'sdkroot=s',
'no-relocatable', 'backends=s',
'no-clean!', 'with-nqp=s',
'no-clean', 'with-nqp=s',
'gen-nqp:s', 'gen-moar:s',
'moar-option=s@', 'git-protocol=s',
'ignore-errors', 'make-install!',
@@ -201,7 +201,7 @@ sub configure_moar_backend {
$config->{ldflags} =~ s/\Q$nqp_config->{'moar::ldrpath_relocatable'}\E ?//;
$config->{ldflags} .= ' '
. (
$config->{no_relocatable}
$self->{no_relocatable}
? $nqp_config->{'moar::ldrpath'}
: $nqp_config->{'moar::ldrpath_relocatable'}
);
@@ -312,27 +312,6 @@ sub configure_js_backend {
);
}

# Command line options not to be included into configure_opts config variable.
sub ignorable_opt {
my $self = shift;
my $opt = shift;
return $opt =~ /^
(?:
gen-
| (?:
help
| no-clean
| ignore-errors
| make-install
| expand
| out
| backends
)
$
)
/x;
}

# Returns all active language specification entries except for .c
sub perl6_specs {
my $self = shift;
@@ -437,15 +416,15 @@ sub gen_nqp {

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

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

for my $opt (qw<git-depth git-reference github-user nqp-repo moar-repo>) {
push @cmd, qq{--$opt=$options->{$opt}} if $options->{$opt};
}
push @cmd, $self->opts_for_configure(
qw<git-depth git-reference github-user nqp-repo moar-repo
no-relocatable ignore-errors>
);

if ( defined $gen_moar ) {
push @cmd, $gen_moar ? "--gen-moar=$gen_moar" : '--gen-moar';

0 comments on commit adc8e21

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