summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig A. Berry <craigberry@mac.com>2011-03-04 16:35:16 -0600
committerCraig A. Berry <craigberry@mac.com>2011-03-04 16:35:16 -0600
commit3185893b8dec1062defd5763c6bb63e945f2a5a4 (patch)
treef0b7506347ac6e9c3bbdcc7eae9146fb127a38b3
parent4d56cd4f546df82c1cabd288669bd8227d6847b4 (diff)
downloadperl-3185893b8dec1062defd5763c6bb63e945f2a5a4.tar.gz
In S_incpush, omit subdirs when PERL_IS_MINIPERL.
The new logic in S_parse_body that loads lib/buildcustomize.pl in miniperl relies on lib being in $INC[0], which it won't be if we've loaded version- and architecture-specific directories before lib. Since miniperl isn't installed and can't do dynamic loading, it doesn't really need those subdirectories, so skip loading them for miniperl.
-rw-r--r--perl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl.c b/perl.c
index 6bb9f46230..491c036260 100644
--- a/perl.c
+++ b/perl.c
@@ -4384,8 +4384,12 @@ S_incpush(pTHX_ const char *const dir, STRLEN len, U32 flags)
{
dVAR;
const U8 using_sub_dirs
+#ifdef PERL_IS_MINIPERL
+ = 0;
+#else
= (U8)flags & (INCPUSH_ADD_VERSIONED_SUB_DIRS
|INCPUSH_ADD_ARCHONLY_SUB_DIRS|INCPUSH_ADD_OLD_VERS);
+#endif
const U8 add_versioned_sub_dirs
= (U8)flags & INCPUSH_ADD_VERSIONED_SUB_DIRS;
const U8 add_archonly_sub_dirs