Skip to content
Permalink
Browse files

Don't use add any RPATH compile flags when installing to /usr

Do it just the way MoarVM also does it. The RPATH is not necessary in that
case, as the libs will be in the library search anyways and having a
rogue RPATH is bad style and trips up some packaging tools.
  • Loading branch information...
patzim authored and AlexDaniel committed Jul 18, 2019
1 parent 540926b commit f41db0445c27fa3b395d6cb0d18b89924e8a5b92
Showing with 8 additions and 6 deletions.
  1. +8 −6 tools/lib/NQP/Config/Rakudo.pm
@@ -360,12 +360,14 @@ sub configure_moar_backend {
$config->{ldflags} = $nqp_config->{'moar::ldflags'};
$config->{ldflags} =~ s/\Q$nqp_config->{'moar::ldrpath'}\E ?//;
$config->{ldflags} =~ s/\Q$nqp_config->{'moar::ldrpath_relocatable'}\E ?//;
$config->{ldflags} .= ' '
. (
$config->{relocatable} eq 'reloc'
? $nqp_config->{'moar::ldrpath_relocatable'}
: $nqp_config->{'moar::ldrpath'}
);
if ( $config->{prefix} ne '/usr' ) {
$config->{ldflags} .= ' '
. (
$config->{relocatable} eq 'reloc'
? $nqp_config->{'moar::ldrpath_relocatable'}
: $nqp_config->{'moar::ldrpath'}
);
}
$config->{ldlibs} = $nqp_config->{'moar::ldlibs'};
$config->{'mingw_unicode'} = '';

0 comments on commit f41db04

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