aboutsummaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-01-27 19:03:13 +0100
committerRichard Levitte <levitte@openssl.org>2016-01-27 19:03:13 +0100
commit8ed40b83ec19aab146a3df701c83066c8788a7a8 (patch)
treedf223374bcb061fd98257e4f76eda6c72b91642f /Configure
parent920ed8c81d9f6ff76564add0cd4605ac0ff86c88 (diff)
downloadopenssl-8ed40b83ec19aab146a3df701c83066c8788a7a8.zip
openssl-8ed40b83ec19aab146a3df701c83066c8788a7a8.tar.gz
openssl-8ed40b83ec19aab146a3df701c83066c8788a7a8.tar.bz2
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>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure12
1 files changed, 5 insertions, 7 deletions
diff --git a/Configure b/Configure
index feb4cc9..e52eecd 100755
--- a/Configure
+++ b/Configure
@@ -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;