summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2015-10-09 20:00:53 +0200
committerEmilia Kasper <emilia@openssl.org>2015-10-14 19:08:54 +0200
commitc97c7f8d53dda12f4fda24fc7542281999df97f6 (patch)
tree4d4d9e93dd179f90f9c12fec5a8f2ed16b5137ad /Configure
parenta20d9422cf7a516cd576be8f91fe90738459ef42 (diff)
make depend: prefer clang over makedepend
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/Configure b/Configure
index 81b263fa19..e374a69dca 100755
--- a/Configure
+++ b/Configure
@@ -1647,10 +1647,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$/ or $ecc =~ /clang$/);
foreach $wopt (split /\s+/, $gcc_devteam_warn)
@@ -1714,6 +1715,7 @@ while (<IN>)
s/^AR=\s*ar/AR= $ar/;
s/^RANLIB=.*/RANLIB= $ranlib/;
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
}
s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;