summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2009-09-08 21:48:45 +0100
committerNicholas Clark <nick@ccl4.org>2009-09-08 21:48:45 +0100
commit6afd19bc36bc53869c8b2366fb22deb141c4156e (patch)
tree49fc5ea78699683acfe67a4cc7401dabe4c6d8e8 /win32
parent798fd3e29f1fe8240c74a40c471e3d19a421ea6b (diff)
downloadperl-6afd19bc36bc53869c8b2366fb22deb141c4156e.tar.gz
Can't build Dynamic extensions without DynaLoader.pm in place.
Add a dependency to ensure the order is correct.
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile7
-rw-r--r--win32/makefile.mk7
2 files changed, 10 insertions, 4 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 3279ce7d9f..9b1a05731f 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1058,11 +1058,14 @@ MakePPPort_clean:
-if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\mkppport --clean
#-------------------------------------------------------------------------------
-Extensions: ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+# The rule for $(DYNALOADER).c makes DynaLoader.pm, and that is needed for
+# ExtUtils::Mkbootstrap. There's no direct way to mark a dependency on
+# DynaLoader.pm, so this will have to do
+Extensions: ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER).c
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic
-Extensions_reonly: ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+Extensions_reonly: ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER).c
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic +re
diff --git a/win32/makefile.mk b/win32/makefile.mk
index fa23f07ac9..ca5fc29c4c 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1387,11 +1387,14 @@ MakePPPort_clean:
-if exist $(MINIPERL) $(MINIPERL) -I..\lib ..\mkppport --clean
#-------------------------------------------------------------------------------
-Extensions : ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+# The rule for $(DYNALOADER).c makes DynaLoader.pm, and that is needed for
+# ExtUtils::Mkbootstrap. There's no direct way to mark a dependency on
+# DynaLoader.pm, so this will have to do
+Extensions : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER).c
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic
-Extensions_reonly : ..\make_ext.pl $(PERLDEP) $(CONFIGPM)
+Extensions_reonly : ..\make_ext.pl $(PERLDEP) $(CONFIGPM) $(DYNALOADER).c
$(XCOPY) ..\*.h $(COREDIR)\*.*
$(MINIPERL) -I..\lib ..\make_ext.pl "MAKE=$(MAKE)" --dir=$(EXTDIR) --dynamic +re