Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[GH #852] Avoid unneeded libparrot already exists with rpath

  • Loading branch information...
commit b6fcac400cd5b5b2b74677b614cfa1389cf12406 1 parent 00d8e4d
@rurban rurban authored
Showing with 11 additions and 8 deletions.
  1. +11 −8 config/inter/libparrot.pm
View
19 config/inter/libparrot.pm
@@ -43,16 +43,19 @@ sub runstep {
$parrot_is_shared = 0 unless $conf->data->get('has_dynamic_linking');
# Parrot can't necessarily handle a pre-existing installed shared
- # libparrot.so. At this point, we don't know the actual name
- # of the shared parrot library. So we try some candidates.
+ # libparrot.so without rpath.
+ # At this point, we don't know the actual name of the shared parrot
+ # library. So we try some candidates.
my @libs = get_libs();
my @libpaths = get_libpaths($conf);
- foreach my $f (@libs) {
- foreach my $d (@libpaths) {
- my $oldversion = File::Spec->catfile($d, $f);
- if (-e $oldversion) {
- warn("\nWarning: Building a shared parrot library may conflict " .
- "with your previously-installed $oldversion\n");
+ if ($disable_rpath or !$conf->data->get('rpath')) {
+ foreach my $f (@libs) {
+ foreach my $d (@libpaths) {
+ my $oldversion = File::Spec->catfile($d, $f);
+ if (-e $oldversion) {
+ warn("\nWarning: Building a shared parrot library may conflict " .
+ "with your previously-installed $oldversion\n");
+ }
}
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.