Fix check of what makedepprog should be

A mistake was made and the setting of this config variable got
reverted to an older behavior.  This restores the latest.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
This commit is contained in:
Richard Levitte 2016-01-27 19:03:13 +01:00
parent 920ed8c81d
commit 8ed40b83ec
1 changed files with 5 additions and 7 deletions

View File

@ -1142,10 +1142,11 @@ if (!$no_asm) {
}
}
$config{makedepprog} = "makedepend";
if ($target{cc} eq "gcc" || ($target{cc} eq 'cc' && $config{target} =~ /darwin/)) {
$config{makedepprog} = $target{cc};
}
my $ecc = $target{cc};
$ecc = "clang" if `$target{cc} --version 2>&1` =~ /clang/;
$config{makedepprog} =
$ecc eq "gcc" || $ecc eq "clang" ? $target{cc} : "makedepend";
$config{depflags} =~ s/^\s*//;
@ -1216,9 +1217,6 @@ if (defined($config{api})) {
$config{cflags} .= " $apiflag";
}
my $ecc = $target{cc};
$ecc = "clang" if `$target{cc} --version 2>&1` =~ /clang/;
if ($strict_warnings)
{
my $wopt;