fix Win32 nmake cant rebuild DynaLoader.obj on Makefile regen bug

See [perl #123123] for details.
Perl · Nov 5, 2014 · 1ea1c22 · 1ea1c22
1 parent 9aa4d47
commit 1ea1c22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -185,10 +185,7 @@
 	    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';
 	}
     }