diff options
author | Richard Levitte <levitte@openssl.org> | 2017-12-11 20:54:07 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-12-12 17:21:46 +0100 |
commit | fe191b49b3eb1f14afa528b5f64a687488470daa (patch) | |
tree | f66eade5b10dc6d6f524e11d72b6fd9703c6e4e9 /Configure | |
parent | 5f0e171a10325ec4502c2ce41b56d46f3c121fcb (diff) |
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 <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4907)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -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}; } |