summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/DynaLoader/Makefile.PL3
-rw-r--r--make_ext.pl5
2 files changed, 3 insertions, 5 deletions
diff --git a/ext/DynaLoader/Makefile.PL b/ext/DynaLoader/Makefile.PL
index 76c3bc0c7e..864af3ed8e 100644
--- a/ext/DynaLoader/Makefile.PL
+++ b/ext/DynaLoader/Makefile.PL
@@ -14,7 +14,8 @@ WriteMakefile(
VERSION_FROM => 'DynaLoader_pm.PL',
PL_FILES => {'DynaLoader_pm.PL'=>'DynaLoader.pm'},
PM => {'DynaLoader.pm' => '$(INST_LIBDIR)/DynaLoader.pm'},
- depend => {'DynaLoader$(OBJ_EXT)' => 'dlutils.c'},
+ depend => { 'DynaLoader$(OBJ_EXT)' => 'dlutils.c',
+ 'DynaLoader.c' => 'DynaLoader.xs'},
clean => {FILES => 'DynaLoader.c DynaLoader.xs DynaLoader.pm'},
);
diff --git a/make_ext.pl b/make_ext.pl
index 126bf737d5..dbef0d5d42 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -185,10 +185,7 @@ if (IS_WIN32) {
next;
}
push @extspec, $_;
- if($_ eq 'DynaLoader' and $target !~ /clean$/) {
- # No, we don't know why nmake can't work out the dependency chain
- push @{$extra_passthrough{$_}}, 'DynaLoader.c';
- } elsif(FindExt::is_static($_)) {
+ if($_ ne 'DynaLoader' && FindExt::is_static($_)) {
push @{$extra_passthrough{$_}}, 'LINKTYPE=static';
}
}