[openssl-commits] [openssl] master update

[Emilia Kasper]

The branch master has been updated
       via  58dd1ce91aeafb513fa9fd09740e3151c2479314 (commit)
      from  4ec36aff2a3c221b640dafa56ac838312e6724f4 (commit)


- Log -----------------------------------------------------------------
commit 58dd1ce91aeafb513fa9fd09740e3151c2479314
Author: Emilia Kasper <emilia at openssl.org>
Date:   Fri Oct 9 20:00:53 2015 +0200

    make depend: prefer clang over makedepend
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configure | 7 ++++---
 util/domd | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Configure b/Configure
index 06b2278..9ff6e70 100755
--- a/Configure
+++ b/Configure
@@ -1635,10 +1635,11 @@ if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
 	$shlib_minor=$2;
 	}
 
+my $ecc = $cc;
+$ecc = "clang" if `$cc --version 2>&1` =~ /clang/;
+
 if ($strict_warnings)
 	{
-	my $ecc = $cc;
-	$ecc = "clang" if `$cc --version 2>&1` =~ /clang/;
 	my $wopt;
 	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc(-\d(\.\d)*)?$/ or $ecc =~ /clang$/);
 	foreach $wopt (split /\s+/, $gcc_devteam_warn)
@@ -1703,7 +1704,7 @@ while (<IN>)
 		s/^CC=.*$/CC= $cc/;
 		s/^AR=\s*ar/AR= $ar/;
 		s/^RANLIB=.*/RANLIB= $ranlib/;
-		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc" || ($cc eq 'cc' && $target =~ /darwin/);
+		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
 		}
 	s/^CFLAG=.*$/CFLAG= $cflags/;
 	s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
diff --git a/util/domd b/util/domd
index 552a352..f5be00d 100755
--- a/util/domd
+++ b/util/domd
@@ -12,7 +12,8 @@ fi
 if [ "$MAKEDEPEND" = "" ]; then MAKEDEPEND=makedepend; fi
 
 cp Makefile Makefile.save
-if expr "$MAKEDEPEND" : '.*cc' > /dev/null; then
+if ${MAKEDEPEND} --version 2>&1 | grep -q "clang" ||
+   echo $MAKEDEPEND | grep -q "gcc"; then
     args=""
     while [ $# -gt 0 ]; do
 	if [ "$1" != "--" ]; then args="$args $1"; fi