summaryrefslogtreecommitdiff
path: root/perl.c
diff options
context:
space:
mode:
authorAlexandre (Midnite) Jousset <mid@gtmp.org>2014-09-05 03:58:20 +0200
committerFather Chrysostomos <sprout@cpan.org>2014-09-04 20:13:16 -0700
commit5de87db5dcf6399b14b545cff7dd99b63732e2c8 (patch)
treeed6b9aed74bff22cfecf8a8262b0023ae1f9e136 /perl.c
parent7950e9cf39c803dbea774d03b90552b92052b83d (diff)
downloadperl-5de87db5dcf6399b14b545cff7dd99b63732e2c8.tar.gz
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.
Diffstat (limited to 'perl.c')
-rw-r--r--perl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl.c b/perl.c
index 8f452739a6..478b415b86 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. */