diff options
author | Nicholas Clark <nick@ccl4.org> | 2009-09-08 16:30:46 +0100 |
---|---|---|
committer | Nicholas Clark <nick@ccl4.org> | 2009-09-08 16:30:46 +0100 |
commit | d1a2168615d31496c65bd27adf6b78d44834861c (patch) | |
tree | 9ee4bdd972bce97496423f5b177600221bb7c2e3 | |
parent | 9aebd117e328400bce3446111a78ce3bdd6bcd47 (diff) | |
download | perl-d1a2168615d31496c65bd27adf6b78d44834861c.tar.gz |
Build the nonxs extensions before running mkppport.
(It requires several modules that we'd like to move from lib/ to ext/
In turn, as it runs before the dynamic extensions are built, it means that
all modules *they* require at configure and build time will already be in lib,
which simplifies things considerably. We then only need to worry about a
subset of pure-perl modules in ext/ that require each other to build.)
-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 e9ffdcaf82..db5e90ec2a 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -935,7 +935,7 @@ makeppport: miniperl\$(EXE_EXT) \$(CONFIGPM) *) $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: makeppport -makeppport: miniperl$(EXE_EXT) $(CONFIGPM) +makeppport: miniperl$(EXE_EXT) $(CONFIGPM) $(nonxs_ext) $(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib mkppport !NO!SUBS! diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index b65fa0c660..e256b164c7 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -750,7 +750,7 @@ preplibrary : $(MINIPERL_EXE) $(LIBPREREQ) @ Create/Directory [.lib.auto] @ $(MINIPERL) -e "use AutoSplit; autosplit_lib_modules(@ARGV)" [.lib]*.pm [.lib.*]*.pm [.lib.*.*]*.pm -makeppport : $(MINIPERL_EXE) $(ARCHDIR)Config.pm +makeppport : $(MINIPERL_EXE) $(ARCHDIR)Config.pm nonxsext $(MINIPERL) mkppport [.lib.pods]perl.pod : [.pod]perl.pod diff --git a/win32/Makefile b/win32/Makefile index 29e14526c6..7add678ec7 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1051,7 +1051,7 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs -MakePPPort: $(MINIPERL) $(CONFIGPM) +MakePPPort: $(MINIPERL) $(CONFIGPM) Extensions_nonxs $(MINIPERL) -I..\lib ..\mkppport MakePPPort_clean: diff --git a/win32/makefile.mk b/win32/makefile.mk index 1b5cff1884..dd6320aa96 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1380,7 +1380,7 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs -MakePPPort: $(MINIPERL) $(CONFIGPM) +MakePPPort: $(MINIPERL) $(CONFIGPM) Extensions_nonxs $(MINIPERL) -I..\lib ..\mkppport MakePPPort_clean: |