Merge branch 'master' of https://github.com/rakudo/rakudo into eval-w…

…ith-unit
rakudo · Jul 18, 2019 · e827ae4 · e827ae4
2 parents 9d79cba + 085ed2f
commit e827ae4
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/tools/lib/NQP/Config/Rakudo.pm b/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'} = '';