From: Richard Levitte <levitte@openssl.org>
Date: Wed, 27 Jan 2016 18:03:13 +0000 (+0100)
Subject: Fix check of what makedepprog should be
X-Git-Tag: OpenSSL_1_1_0-pre3~399
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8ed40b83ec19aab146a3df701c83066c8788a7a8;p=oweals%2Fopenssl.git

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>
---

diff --git a/Configure b/Configure
index feb4cc9a60..e52eecd522 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;