Commit 5f16ab33 authored by Richard Levitte's avatar Richard Levitte
Browse files

Windows build: build foo.d after foo.obj 



We made the build of foo.obj depend on foo.d, meaning the latter gets
built first.  Unfortunately, the way the compiler works, we are forced
to redirect all output to foo.d, meaning that if the source contains
an error, the build fails without showing those errors.

We therefore remove the dependency and force the build of foo.d to
always happen after build of foo.obj.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7533)
parent 6ab937f2

Configurations/windows-makefile.tmpl

+7 −9
Original line number Diff line number Diff line
@@ -461,22 +461,20 @@ $obj$objext: $deps 
	\$(AS) \$(ASFLAGS) \$(ASOUTFLAG)\$\@ $srcs

EOF

     }

     return <<"EOF"	if (!$disabled{makedepend});

$obj$depext: $deps

	\$(CC) \$(CFLAGS) $ecflags$inc /Zs /showIncludes $srcs 2>&1 | \\

     my $recipe = <<"EOF";

$obj$objext: $deps

	\$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs

EOF

     $recipe .= <<"EOF"	unless $disabled{makedepend};

	\$(CC) $incs \$(CFLAGS) $ecflags /Zs /showIncludes $srcs 2>&1 | \\

	    "\$(PERL)" -n << > $obj$depext

chomp;

s/^Note: including file: *//;

\$\$collect{\$\$_} = 1;

END { print '$obj$objext: ',join(" ", sort keys \%collect),"\\n" }

<<

$obj$objext: $obj$depext

	\$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs

EOF

    return <<"EOF"	if ($disabled{makedepend});

$obj$objext: $deps

	\$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs

EOF

     return $recipe;

 }



 # On Unix, we build shlibs from static libs, so we're ignoring the