mirror of https://github.com/openssl/openssl
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)
This commit is contained in:
parent
5f0e171a10
commit
fe191b49b3
13
Configure
13
Configure
|
@ -1279,12 +1279,19 @@ unless ($disabled{asm}) {
|
||||||
|
|
||||||
my %predefined = compiler_predefined($target{cc});
|
my %predefined = compiler_predefined($target{cc});
|
||||||
|
|
||||||
|
# Check for makedepend capabilities.
|
||||||
if (!$disabled{makedepend}) {
|
if (!$disabled{makedepend}) {
|
||||||
# We know that GNU C version 3 and up as well as all clang
|
if ($config{target} =~ /^(VC|vms)-/) {
|
||||||
# versions support dependency generation
|
# For VC- and vms- targets, there's nothing more to do here. The
|
||||||
if ($predefined{__GNUC__} >= 3) {
|
# 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}";
|
$config{makedepprog} = "\$(CROSS_COMPILE)$target{cc}";
|
||||||
} else {
|
} else {
|
||||||
|
# In all other cases, we look for 'makedepend', and disable the
|
||||||
|
# capability if not found.
|
||||||
$config{makedepprog} = which('makedepend');
|
$config{makedepprog} = which('makedepend');
|
||||||
$disabled{makedepend} = "unavailable" unless $config{makedepprog};
|
$disabled{makedepend} = "unavailable" unless $config{makedepprog};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue