Attachment #218253 for bug #134650

View | Details | Raw Unified | Return to bug 134650 | Differences between

and this patch




true)
	# Prefix all runs of 'miniperl' and 'perl' with
	# $ldlibpth so that ./perl finds *this* shared libperl.
#	case "$LD_LIBRARY_PATH" in
#	'')
#		ldlibpth="LD_LIBRARY_PATH=`pwd`";;
#	*)
#		ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
#	esac

	pldlflags="$cccdlflags"
	static_target='static_pic'

	        ldlibpth=''
	        ;;
	    *)
# We compile in the library path in OE from cross-compile, so lets not do this
#		eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
		;;
	    esac
	    # Strip off any trailing :'s

	    # INSTALL file, under "Building a shared perl library".
	    # If there is no pre-existing $libperl, we don't need
	    # to do anything further.
	    echo linux libraries overwritten by cross-compile patches
		rm -f preload
		cat <<'EOT' > preload
#! /bin/sh
lib=$1
shift
test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
exec "$@"
EOT
		chmod 755 preload
		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
	    fi
	    ;;
	os390)	test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
		;;

.c.s:
	$(CCCMDSRC) -S $*.c

#all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
#	@echo " ";
#	@echo "	Everything is up to date. Type '$(MAKE) test' to run test suite."

all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) $(unidatafiles)

more: extra.pods $(private) $(public)

more2: $(dynamic_ext)

more3: $(nonxs_ext)

more4: extras.make

.PHONY: all compile translators utilities


	cd x2p; $(MAKE) compile;
	cd pod; $(MAKE) compile;

translators:	$(CONFIGPM) FORCE
	@echo " "; echo "	Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all

utilities:	$(CONFIGPM) $(plextract) lib/lib.pm FORCE
	@echo " "; echo "	Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all



	$(CC) -o miniperl $(CLDFLAGS) \
	    `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
	mv -f miniperl miniperl-target
	ln -s ${HOSTPERL} miniperl
#	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
!NO!SUBS!
		;;
	next4*)

miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
	$(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
	mv -f miniperl miniperl-target
	ln -s ${HOSTPERL} miniperl
#	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
!NO!SUBS!
		;;
	darwin*)

	-@rm -f miniperl.xok
	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \
	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
	mv -f miniperl miniperl-target
	ln -s ${HOSTPERL} miniperl
#	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
!NO!SUBS!
		;;
	*)

	-@rm -f miniperl.xok
	$(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \
	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
	mv -f miniperl miniperl-target
	ln -s ${HOSTPERL} miniperl
#	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
!NO!SUBS!
		;;
	esac

# We need to autosplit in two steps because VOS can't handle so many args
#
.PHONY: preplibrary
preplibrary: $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)
	@sh ./makedir lib/auto
	@echo "	AutoSplitting perl library"
	$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \

		autosplit_lib_modules(@ARGV)' lib/*/*.pm
	$(MAKE) lib/re.pm

lib/Config.pod: config.sh configpm Porting/Glossary
	$(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl lib/Config.pm

$(CONFIGPM): lib/Config.pod

lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM)
	$(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm

lib/re.pm: ext/re/re.pm
	cp ext/re/re.pm lib/re.pm

$(plextract):	$(CONFIGPM) x2p/s2p
	@-rm -f $@
	$(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL

x2p/s2p: $(CONFIGPM) x2p/s2p.PL
	cd x2p; $(LDLIBPTH) $(MAKE) s2p

lib/lib.pm:	$(CONFIGPM)
	@-rm -f $@
	$(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL

unidatafiles $(unidatafiles): uni.data

uni.data: $(CONFIGPM) lib/unicore/mktables
	cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w
	touch uni.data

extra.pods:
	-@test -f extra.pods && rm -f `cat extra.pods`
	-@rm -f extra.pods
	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \

		cd ../pod; $(MAKE) compile; \
	else :; \
	fi
	${HOSTPERL} -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
	$(MAKE) extras.install

install.man:	all installman
	${HOSTPERL} -Ifake_config_library -Ilib -MConfig installman --destdir=$(DESTDIR) $(INSTALLFLAGS)

# XXX Experimental. Hardwired values, but useful for testing.
# Eventually Configure could ask for some of these values.

#
# DynaLoader may be needed for extensions that use Makefile.PL.

$(DYNALOADER):	preplibrary FORCE
	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)

d_dummy $(dynamic_ext):	preplibrary $(DYNALOADER) FORCE
	@$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)

s_dummy $(static_ext):	preplibrary $(DYNALOADER) FORCE
	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)

n_dummy $(nonxs_ext):	preplibrary $(DYNALOADER) FORCE
	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)

.PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \


test_prep_pre: preplibrary utilities $(nonxs_ext)

test_prep: test_prep_pre $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
	PERL=./perl $(MAKE) _test_prep

_test_tty:


# Can't depend on lib/Config.pm because that might be where miniperl
# is crashing.
minitest: lib/re.pm minitest.prep
	- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
		&& $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty


Return to bug 134650

Lines 43-54 Link Here

(-)perl-5.8.8.orig/Makefile.SH (-44 / +52 lines)
43	true)	43	true)
44	# Prefix all runs of 'miniperl' and 'perl' with	44	# Prefix all runs of 'miniperl' and 'perl' with
45	# $ldlibpth so that ./perl finds this shared libperl.	45	# $ldlibpth so that ./perl finds this shared libperl.
46	case "$LD_LIBRARY_PATH" in	46	# case "$LD_LIBRARY_PATH" in
47	'')	47	# '')
48	ldlibpth="LD_LIBRARY_PATH=`pwd`";;	48	# ldlibpth="LD_LIBRARY_PATH=`pwd`";;
49	*)	49	# *)
50	ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;	50	# ldlibpth="LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}";;
51	esac	51	# esac
52		52
53	pldlflags="$cccdlflags"	53	pldlflags="$cccdlflags"
54	static_target='static_pic'	54	static_target='static_pic'
Lines 108-114 Link Here
108	ldlibpth=''	108	ldlibpth=''
109	;;	109	;;
110	*)	110	*)
111	eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""	111	# We compile in the library path in OE from cross-compile, so lets not do this
		112	# eval "ldlibpth=\"$ldlibpthname=`pwd`:\$$ldlibpthname\""
112	;;	113	;;
113	esac	114	esac
114	# Strip off any trailing :'s	115	# Strip off any trailing :'s
Lines 129-146 Link Here
129	# INSTALL file, under "Building a shared perl library".	130	# INSTALL file, under "Building a shared perl library".
130	# If there is no pre-existing $libperl, we don't need	131	# If there is no pre-existing $libperl, we don't need
131	# to do anything further.	132	# to do anything further.
132	if test -f $archlib/CORE/$libperl; then	133	echo linux libraries overwritten by cross-compile patches
133	rm -f preload
134	cat <<'EOT' > preload
135	#! /bin/sh
136	lib=$1
137	shift
138	test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
139	exec "$@"
140	EOT
141	chmod 755 preload
142	ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
143	fi
144	;;	134	;;
145	os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"	135	os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth"
146	;;	136	;;
Lines 401-409 Link Here
401	.c.s:	391	.c.s:
402	$(CCCMDSRC) -S $*.c	392	$(CCCMDSRC) -S $*.c
403		393
404	all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make	394	#all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make
405	@echo " ";	395	# @echo " ";
406	@echo " Everything is up to date. Type '$(MAKE) test' to run test suite."	396	# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite."
		397
		398	all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) $(unidatafiles)
		399
		400	more: extra.pods $(private) $(public)
		401
		402	more2: $(dynamic_ext)
		403
		404	more3: $(nonxs_ext)
		405
		406	more4: extras.make
407		407
408	.PHONY: all compile translators utilities	408	.PHONY: all compile translators utilities
409		409
Lines 413-422 Link Here
413	cd x2p; $(MAKE) compile;	413	cd x2p; $(MAKE) compile;
414	cd pod; $(MAKE) compile;	414	cd pod; $(MAKE) compile;
415		415
416	translators: miniperl$(EXE_EXT) $(CONFIGPM) FORCE	416	translators: $(CONFIGPM) FORCE
417	@echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all	417	@echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all
418		418
419	utilities: miniperl$(EXE_EXT) $(CONFIGPM) $(plextract) lib/lib.pm FORCE	419	utilities: $(CONFIGPM) $(plextract) lib/lib.pm FORCE
420	@echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all	420	@echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all
421		421
422		422
Lines 591-597 Link Here
591	$(CC) -o miniperl $(CLDFLAGS) \	591	$(CC) -o miniperl $(CLDFLAGS) \
592	`echo $(obj) \| sed 's/ op$(OBJ_EXT) / /'` \	592	`echo $(obj) \| sed 's/ op$(OBJ_EXT) / /'` \
593	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)	593	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
594	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest	594	mv -f miniperl miniperl-target
		595	ln -s ${HOSTPERL} miniperl
		596	# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest
595	!NO!SUBS!	597	!NO!SUBS!
596	;;	598	;;
597	next4*)	599	next4*)
Lines 599-605 Link Here
599	miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)	601	miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
600	$(CC) -o miniperl `echo $(obj) \| sed 's/ op$(OBJ_EXT) / /'` \	602	$(CC) -o miniperl `echo $(obj) \| sed 's/ op$(OBJ_EXT) / /'` \
601	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)	603	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
602	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest	604	mv -f miniperl miniperl-target
		605	ln -s ${HOSTPERL} miniperl
		606	# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest
603	!NO!SUBS!	607	!NO!SUBS!
604	;;	608	;;
605	darwin*)	609	darwin*)
Lines 620-626 Link Here
620	-@rm -f miniperl.xok	624	-@rm -f miniperl.xok
621	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \	625	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \
622	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)	626	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
623	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest	627	mv -f miniperl miniperl-target
		628	ln -s ${HOSTPERL} miniperl
		629	# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest
624	!NO!SUBS!	630	!NO!SUBS!
625	;;	631	;;
626	*)	632	*)
Lines 629-635 Link Here
629	-@rm -f miniperl.xok	635	-@rm -f miniperl.xok
630	$(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \	636	$(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \
631	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)	637	miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
632	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest	638	mv -f miniperl miniperl-target
		639	ln -s ${HOSTPERL} miniperl
		640	# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' \|\| $(MAKE) minitest
633	!NO!SUBS!	641	!NO!SUBS!
634	;;	642	;;
635	esac	643	esac
Lines 766-772 Link Here
766	# We need to autosplit in two steps because VOS can't handle so many args	774	# We need to autosplit in two steps because VOS can't handle so many args
767	#	775	#
768	.PHONY: preplibrary	776	.PHONY: preplibrary
769	preplibrary: miniperl$(EXE_EXT) $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)	777	preplibrary: $(CONFIGPM) lib/lib.pm $(PREPLIBRARY_LIBPERL)
770	@sh ./makedir lib/auto	778	@sh ./makedir lib/auto
771	@echo " AutoSplitting perl library"	779	@echo " AutoSplitting perl library"
772	$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \	780	$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
Lines 775-809 Link Here
775	autosplit_lib_modules(@ARGV)' lib//.pm	783	autosplit_lib_modules(@ARGV)' lib//.pm
776	$(MAKE) lib/re.pm	784	$(MAKE) lib/re.pm
777		785
778	lib/Config.pod: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary	786	lib/Config.pod: config.sh configpm Porting/Glossary
779	$(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl lib/Config.pm	787	$(LDLIBPTH) ./miniperl -Ilib configpm --heavy=lib/Config_heavy.pl lib/Config.pm
780		788
781	$(CONFIGPM): lib/Config.pod	789	$(CONFIGPM): lib/Config.pod
782		790
783	lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM)	791	lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM)
784	$(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm	792	$(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm
785		793
786	lib/re.pm: ext/re/re.pm	794	lib/re.pm: ext/re/re.pm
787	cp ext/re/re.pm lib/re.pm	795	cp ext/re/re.pm lib/re.pm
788		796
789	$(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p	797	$(plextract): $(CONFIGPM) x2p/s2p
790	@-rm -f $@	798	@-rm -f $@
791	$(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL	799	$(LDLIBPTH) ./miniperl -I`pwd`/lib $@.PL
792		800
793	x2p/s2p: miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p.PL	801	x2p/s2p: $(CONFIGPM) x2p/s2p.PL
794	cd x2p; $(LDLIBPTH) $(MAKE) s2p	802	cd x2p; $(LDLIBPTH) $(MAKE) s2p
795		803
796	lib/lib.pm: miniperl$(EXE_EXT) $(CONFIGPM)	804	lib/lib.pm: $(CONFIGPM)
797	@-rm -f $@	805	@-rm -f $@
798	$(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL	806	$(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL
799		807
800	unidatafiles $(unidatafiles): uni.data	808	unidatafiles $(unidatafiles): uni.data
801		809
802	uni.data: miniperl$(EXE_EXT) $(CONFIGPM) lib/unicore/mktables	810	uni.data: $(CONFIGPM) lib/unicore/mktables
803	cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w	811	cd lib/unicore && $(LDLIBPTH) ../../miniperl -I../../lib mktables -w
804	touch uni.data	812	touch uni.data
805		813
806	extra.pods: miniperl$(EXE_EXT)	814	extra.pods:
807	-@test -f extra.pods && rm -f `cat extra.pods`	815	-@test -f extra.pods && rm -f `cat extra.pods`
808	-@rm -f extra.pods	816	-@rm -f extra.pods
809	-@for x in `grep -l '^=[a-z]' README.* \| grep -v README.vms` ; do \	817	-@for x in `grep -l '^=[a-z]' README.* \| grep -v README.vms` ; do \
Lines 857-867 Link Here
857	cd ../pod; $(MAKE) compile; \	865	cd ../pod; $(MAKE) compile; \
858	else :; \	866	else :; \
859	fi	867	fi
860	$(LDLIBPTH) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)	868	${HOSTPERL} -Ifake_config_library -Ilib -MConfig installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
861	$(MAKE) extras.install	869	$(MAKE) extras.install
862		870
863	install.man: all installman	871	install.man: all installman
864	$(LDLIBPTH) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS)	872	${HOSTPERL} -Ifake_config_library -Ilib -MConfig installman --destdir=$(DESTDIR) $(INSTALLFLAGS)
865		873
866	# XXX Experimental. Hardwired values, but useful for testing.	874	# XXX Experimental. Hardwired values, but useful for testing.
867	# Eventually Configure could ask for some of these values.	875	# Eventually Configure could ask for some of these values.
Lines 978-993 Link Here
978	#	986	#
979	# DynaLoader may be needed for extensions that use Makefile.PL.	987	# DynaLoader may be needed for extensions that use Makefile.PL.
980		988
981	$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE	989	$(DYNALOADER): preplibrary FORCE
982	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)	990	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
983		991
984	d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE	992	d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE
985	@$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)	993	@$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
986		994
987	s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE	995	s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE
988	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)	996	@$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
989		997
990	n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE	998	n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE
991	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)	999	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
992		1000
993	.PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \	1001	.PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \
Lines 1125-1131 Link Here
1125		1133
1126	test_prep_pre: preplibrary utilities $(nonxs_ext)	1134	test_prep_pre: preplibrary utilities $(nonxs_ext)
1127		1135
1128	test_prep: test_prep_pre miniperl$(EXE_EXT) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)	1136	test_prep: test_prep_pre $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL)
1129	PERL=./perl $(MAKE) _test_prep	1137	PERL=./perl $(MAKE) _test_prep
1130		1138
1131	_test_tty:	1139	_test_tty:
Lines 1238-1244 Link Here
1238		1246
1239	# Can't depend on lib/Config.pm because that might be where miniperl	1247	# Can't depend on lib/Config.pm because that might be where miniperl
1240	# is crashing.	1248	# is crashing.
1241	minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep	1249	minitest: lib/re.pm minitest.prep
1242	- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \	1250	- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
1243	&& $(LDLIBPTH) ./perl TEST -minitest base/.t comp/.t cmd/.t run/.t io/.t op/.t uni/*.t </dev/tty	1251	&& $(LDLIBPTH) ./perl TEST -minitest base/.t comp/.t cmd/.t run/.t io/.t op/.t uni/*.t </dev/tty
1244		1252