diff options
| author | Nicholas Clark <nick@ccl4.org> | 2009-09-08 21:33:22 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2009-09-08 21:33:22 +0100 |
| commit | 798fd3e29f1fe8240c74a40c471e3d19a421ea6b (patch) | |
| tree | d8ff3038c37a5b9a22758b72d0cb0401df5b0be5 | |
| parent | d1a2168615d31496c65bd27adf6b78d44834861c (diff) | |
| download | perl-798fd3e29f1fe8240c74a40c471e3d19a421ea6b.tar.gz | |
Build the nonxs extensions before building DynaLoader.
(d1a2168615d3 isn't enough to ensure that the toolchain is in lib/ before we
start processing XS code.)
| -rw-r--r-- | Makefile.SH | 2 | ||||
| -rw-r--r-- | vms/descrip_mms.template | 2 | ||||
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/makefile.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.SH b/Makefile.SH index db5e90ec2a..40ec66fff2 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -1141,7 +1141,7 @@ manicheck: FORCE # # DynaLoader may be needed for extensions that use Makefile.PL. -$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE +$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE $(nonxs_ext) $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS) d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary makeppport $(DYNALOADER) FORCE diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index e256b164c7..ce3e6b41ab 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -678,7 +678,7 @@ nonxsext : $(LIBPREREQ) $(DBG)perlshr$(E) preplibrary makeppport $(MINIPERL_EXE) [.x2p]s2p.com : [.x2p]s2p.PL $(ARCHDIR)Config.pm $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) -[.utils]xsubpp.com : [.utils]xsubpp.PL $(ARCHDIR)Config.pm +[.utils]xsubpp.com : [.utils]xsubpp.PL $(ARCHDIR)Config.pm nonxsext $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) # Rename catches problem with some DECC versions in which object file is diff --git a/win32/Makefile b/win32/Makefile index 7add678ec7..3279ce7d9f 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1036,7 +1036,7 @@ $(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES) $(LIBFILES) $(PERLEXEST_OBJ) $(SETARGV_OBJ) $(PERLEXE_RES) $(EMBED_EXE_MANI) -$(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) +$(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) Extensions_nonxs if not exist $(AUTODIR) mkdir $(AUTODIR) cd $(EXTDIR)\$(*B) ..\$(MINIPERL) -I..\..\lib $(*B)_pm.PL diff --git a/win32/makefile.mk b/win32/makefile.mk index dd6320aa96..fa23f07ac9 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1368,7 +1368,7 @@ $(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES) $(EMBED_EXE_MANI) .ENDIF -$(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) +$(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) Extensions_nonxs if not exist $(AUTODIR) mkdir $(AUTODIR) cd $(EXTDIR)\$(*B) && ..\$(MINIPERL) -I..\..\lib $(*B)_pm.PL cd $(EXTDIR)\$(*B) && ..\$(MINIPERL) -I..\..\lib XSLoader_pm.PL |