From fe191b49b3eb1f14afa528b5f64a687488470daa Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 11 Dec 2017 20:54:07 +0100 Subject: [PATCH] Restore makedepend capabilities for Windows and VMS This got lost somehow. The methods to do makedepend on Windows and VMS are hard coded for cl (Windows) and CC/DECC (VMS), because that's what we currently support natively. Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/4907) --- Configure | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Configure b/Configure index 5abbd72a97..ba646f030a 100755 --- a/Configure +++ b/Configure @@ -1279,12 +1279,19 @@ unless ($disabled{asm}) { my %predefined = compiler_predefined($target{cc}); +# Check for makedepend capabilities. if (!$disabled{makedepend}) { - # We know that GNU C version 3 and up as well as all clang - # versions support dependency generation - if ($predefined{__GNUC__} >= 3) { + if ($config{target} =~ /^(VC|vms)-/) { + # For VC- and vms- targets, there's nothing more to do here. The + # functionality is hard coded in the corresponding build files for + # cl (Windows) and CC/DECC (VMS). + } elsif ($predefined{__GNUC__} >= 3) { + # We know that GNU C version 3 and up as well as all clang + # versions support dependency generation $config{makedepprog} = "\$(CROSS_COMPILE)$target{cc}"; } else { + # In all other cases, we look for 'makedepend', and disable the + # capability if not found. $config{makedepprog} = which('makedepend'); $disabled{makedepend} = "unavailable" unless $config{makedepprog}; }