Skip to content
Permalink
Browse files

Clarify relocatability flag handling

  • Loading branch information...
patzim committed Jun 2, 2019
1 parent b481291 commit 3f0dfcd79f38d9b15cde84a2f56e20793bd030be
Showing with 3 additions and 3 deletions.
  1. +3 −3 tools/lib/NQP/Config/Rakudo.pm
@@ -138,7 +138,7 @@ sub configure_refine_vars {
"Based on found executable $nqp_bin"
);
}
elsif ( $self->cfg('relocatable') && abs_path($prefix) ne abs_path($nqp_prefix) ) {
elsif ( $self->cfg('relocatable') eq 'reloc' && abs_path($prefix) ne abs_path($nqp_prefix) ) {
$self->sorry(
"Installation directory '$prefix' is different from '",
abs_path($nqp_prefix),
@@ -274,7 +274,7 @@ sub configure_moar_backend {
moar => "Unable to read configuration from NQP on MoarVM" );
}

if ( $config->{relocatable} ) {
if ( $config->{relocatable} eq 'reloc' ) {
$config->{static_nqp_home} = '';
$config->{static_perl6_home} = '';
$config->{static_nqp_home_define} = '';
@@ -297,7 +297,7 @@ sub configure_moar_backend {
$config->{ldflags} =~ s/\Q$nqp_config->{'moar::ldrpath_relocatable'}\E ?//;
$config->{ldflags} .= ' '
. (
$config->{relocatable}
$config->{relocatable} eq 'reloc'
? $nqp_config->{'moar::ldrpath_relocatable'}
: $nqp_config->{'moar::ldrpath'}
);

0 comments on commit 3f0dfcd

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