diff options
author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2004-08-02 09:16:13 +0000 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2004-08-02 09:16:13 +0000 |
commit | 0a0461ad65b6f6c174c7a1cc1a803c2f3d17ac03 (patch) | |
tree | d76ea3f8db703475747fc496b203879d8499515a /lib/ExtUtils/MM_Unix.pm | |
parent | 6a0e9e729887ef408896cb941e158abe23871017 (diff) | |
download | perl-0a0461ad65b6f6c174c7a1cc1a803c2f3d17ac03.tar.gz |
Remove empty rpath from .so files
p4raw-id: //depot/perl@23183
Diffstat (limited to 'lib/ExtUtils/MM_Unix.pm')
-rw-r--r-- | lib/ExtUtils/MM_Unix.pm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index c5446af2ff..c1ac258ae3 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -20,7 +20,7 @@ use vars qw($VERSION @ISA use ExtUtils::MakeMaker qw($Verbose neatvalue); -$VERSION = '1.45_01'; +$VERSION = '1.45_02'; require ExtUtils::MM_Any; @ISA = qw(ExtUtils::MM_Any); @@ -414,11 +414,18 @@ sub const_loadlibs { }; my($tmp); for $tmp (qw/ - EXTRALIBS LDLOADLIBS BSLOADLIBS LD_RUN_PATH + EXTRALIBS LDLOADLIBS BSLOADLIBS /) { next unless defined $self->{$tmp}; push @m, "$tmp = $self->{$tmp}\n"; } + # don't set LD_RUN_PATH if empty + for $tmp (qw/ + LD_RUN_PATH + /) { + next unless $self->{$tmp}; + push @m, "$tmp = $self->{$tmp}\n"; + } return join "", @m; } @@ -1156,8 +1163,12 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) blibdirs.exists $(EXPORT_LIS } } + my $ld_run_path_shell = ""; + if ($self->{LD_RUN_PATH} ne "") { + $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" '; + } push(@m, -' LD_RUN_PATH="$(LD_RUN_PATH)" $(LD) '.$ldrun.' $(LDDLFLAGS) '.$ldfrom. +' '.$ld_run_path_shell.'$(LD) '.$ldrun.' $(LDDLFLAGS) '.$ldfrom. ' $(OTHERLDFLAGS) -o $@ $(MYEXTLIB) $(PERL_ARCHIVE) '.$libs.' $(PERL_ARCHIVE_AFTER) $(EXPORT_LIST) $(INST_DYNAMIC_FIX)'); push @m, ' $(CHMOD) $(PERM_RWX) $@ |