disable internal globbing for miniperl (or build breaks out

in a rash of failed dependencies)

p4raw-id: //depot/perl@4389

diff --git a/Makefile.SH b/Makefile.SH
index 6693565..2e88cdd 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -333,7 +333,9 @@ $(LIBPERL_NONSHR): perl$(OBJ_EXT) $(obj)
        $(AR) rcu $(LIBPERL_NONSHR) perl$(OBJ_EXT) $(obj)
 
 $(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT)
-       $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS)
+       $(CCCMD) $(PLDLFLAGS) -DMINIPERL_BUILD -o opmini$(OBJ_EXT) op.c
+       $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) \
+           opmini$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS)
 
 MINIPERLEXP            = $(MINIPERL_NONSHR)
 
@@ -416,7 +418,9 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT)
 # The Module used here must not depend on Config or any extensions.
 
 miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL)
-       $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(LLIBPERL) $(libs)
+       $(CCCMD) $(PLDLFLAGS) -DMINIPERL_BUILD -o opmini$(OBJ_EXT) op.c
+       $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl \
+           miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
        $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
 
 perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT)

diff --git a/op.c b/op.c
index 99151dc..64d801f 100644 (file)
--- a/op.c
+++ b/op.c
@@ -5181,7 +5181,7 @@ Perl_ck_glob(pTHX_ OP *o)
     if (!((gv = gv_fetchpv("glob", FALSE, SVt_PVCV)) && GvIMPORTED_CV(gv)))
        gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV);
 
-#ifdef PERL_INTERNAL_GLOB
+#if defined(PERL_INTERNAL_GLOB) && !defined(MINIPERL_BUILD)
     /* XXX this can be tightened up and made more failsafe. */
     if (!gv) {
        OP *modname = newSVOP(OP_CONST, 0, newSVpvn("File::Glob", 10));
@@ -5192,7 +5192,7 @@ Perl_ck_glob(pTHX_ OP *o)
        gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV);
        LEAVE;
     }
-#endif /* PERL_INTERNAL_GLOB */
+#endif /* PERL_INTERNAL_GLOB && !MINIPERL_BUILD */
 
     if (gv && GvIMPORTED_CV(gv)) {
        append_elem(OP_GLOB, o,

diff --git a/win32/Makefile b/win32/Makefile
index def59fc..f742080 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -141,6 +141,11 @@ CCLIBDIR   = $(CCHOME)\lib
 #BUILDOPT      = $(BUILDOPT) -DPERL_POLLUTE
 
 #
+# enable this to test the File::Glob implementation of CORE::glob
+#
+#BUILDOPT      = $(BUILDOPT) -DPERL_INTERNAL_GLOB
+
+#
 # specify semicolon-separated list of extra directories that modules will
 # look for libraries (spaces in path names need not be quoted)
 #

diff --git a/win32/makefile.mk b/win32/makefile.mk
index a9d6983..bb87b58 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -161,6 +161,11 @@ CCLIBDIR   *= $(CCHOME)\lib
 #BUILDOPT      += -DPERL_POLLUTE
 
 #
+# enable this to test the File::Glob implementation of CORE::glob
+#
+#BUILDOPT      += -DPERL_INTERNAL_GLOB
+
+#
 # specify semicolon-separated list of extra directories that modules will
 # look for libraries (spaces in path names need not be quoted)
 #