[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8ed40b83ec19aab146a3df701c83066c8788a7a8 (commit)
      from  920ed8c81d9f6ff76564add0cd4605ac0ff86c88 (commit)


- Log -----------------------------------------------------------------
commit 8ed40b83ec19aab146a3df701c83066c8788a7a8
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 27 19:03:13 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 12 +++++-------
 1 file 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;