ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/App-Staticperl/mkbundle
(Generate patch)

Comparing cvsroot/App-Staticperl/mkbundle (file contents):
Revision 1.29 by root, Sun Jul 10 01:37:56 2011 UTC vs.
Revision 1.31 by root, Thu Jul 14 20:34:51 2011 UTC

1027 PL_preambleav = newAV (); 1027 PL_preambleav = newAV ();
1028 1028
1029 av_unshift (PL_preambleav, 1); 1029 av_unshift (PL_preambleav, 1);
1030 av_store (PL_preambleav, 0, newSVpv (bootstrap, sizeof (bootstrap) - 1)); 1030 av_store (PL_preambleav, 0, newSVpv (bootstrap, sizeof (bootstrap) - 1));
1031 #else 1031 #else
1032 av_create_and_unshift_one (&PL_preambleav, newSVpv (bootstrap, sizeof (bootstrap) - 1)); 1032 Perl_av_create_and_unshift_one (&PL_preambleav, newSVpv (bootstrap, sizeof (bootstrap) - 1));
1033 #endif 1033 #endif
1034 1034
1035 if (PL_oldname) 1035 if (PL_oldname)
1036 ((XSINIT_t)PL_oldname)(aTHX); 1036 ((XSINIT_t)PL_oldname)(aTHX);
1037} 1037}
1192 $ldopts = $STATIC ? "-static " : ""; 1192 $ldopts = $STATIC ? "-static " : "";
1193 1193
1194 $ldopts .= "$Config{ccdlflags} $Config{ldflags} @libs $Config{archlibexp}/CORE/$Config{libperl} $Config{perllibs}"; 1194 $ldopts .= "$Config{ccdlflags} $Config{ldflags} @libs $Config{archlibexp}/CORE/$Config{libperl} $Config{perllibs}";
1195 1195
1196 my %seen; 1196 my %seen;
1197 $ldopts .= " $_" for grep !$seen{$_}++, ($extralibs =~ /(\S+)/g); 1197 $ldopts .= " $_" for reverse grep !$seen{$_}++, reverse ($extralibs =~ /(\S+)/g);
1198 1198
1199 for (@staticlibs) { 1199 for (@staticlibs) {
1200 $ldopts =~ s/(^|\s) (-l\Q$_\E) ($|\s)/$1-Wl,-Bstatic $2 -Wl,-Bdynamic$3/gx; 1200 $ldopts =~ s/(^|\s) (-l\Q$_\E) ($|\s)/$1-Wl,-Bstatic $2 -Wl,-Bdynamic$3/gx;
1201 } 1201 }
1202 1202

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines