In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/5de87db5dcf6399b14b545cff7dd99b63732e2c8?hp=7950e9cf39c803dbea774d03b90552b92052b83d>
- Log ----------------------------------------------------------------- commit 5de87db5dcf6399b14b545cff7dd99b63732e2c8 Author: Alexandre (Midnite) Jousset <[email protected]> Date: Fri Sep 5 03:58:20 2014 +0200 perl.c: fix small bug on Android from commit 9054c81 Commit b33b7ab made PERL_LIB absolute when cross-compiling on Android. Commit 9054c81 added incompatibility with this. Now, only add "./" to run buildcustomize.pl when miniperl is running with -T. ----------------------------------------------------------------------- Summary of changes: perl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl.c b/perl.c index 8f45273..478b415 100644 --- a/perl.c +++ b/perl.c @@ -2072,10 +2072,10 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit) it should be reported immediately as a build failure. */ (void)Perl_av_create_and_unshift_one(aTHX_ &PL_preambleav, Perl_newSVpvf(aTHX_ - "BEGIN { my $f = q%c./%"SVf"/buildcustomize.pl%c; " + "BEGIN { my $f = q%c%s%"SVf"/buildcustomize.pl%c; " "do {local $!; -f $f }" " and do $f || die $@ || qq '$f: $!' }", - 0, SVfARG(*inc0), 0)); + 0, (TAINTING_get ? "./" : ""), SVfARG(*inc0), 0)); } # else /* SITELIB_EXP is a function call on Win32. */ -- Perl5 Master Repository
