[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Andy Polyakov]

The branch OpenSSL_1_1_0-stable has been updated
       via  29627a364be80f8c30fe7824bc3642d43d7e2c0a (commit)
      from  8748dccbbab088d9b5484769343121051db78ed9 (commit)


- Log -----------------------------------------------------------------
commit 29627a364be80f8c30fe7824bc3642d43d7e2c0a
Author: Todd Short <tshort at akamai.com>
Date:   Thu May 3 11:17:49 2018 -0400

    Configure: fix Mac OS X builds that still require makedepend
    
    Earlier Apple Xcode compilers, e.g. one targeting Mac OS X 10.7, don't
    support dependency generation and one still has to use makedepend.  It's
    unclear when it was fixed, but all clang-based Apple compilers seem to
    support -M options.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6167)

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

Summary of changes:
 Configure | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index c003364..7f073b6 100755
--- a/Configure
+++ b/Configure
@@ -1215,8 +1215,10 @@ if ($^O ne "VMS") {
 
     if (!$disabled{makedepend}) {
 	# We know that GNU C version 3 and up as well as all clang
-	# versions support dependency generation
-	if ($predefined{__GNUC__} >= 3) {
+	# versions support dependency generation, but Xcode did not
+	# handle $cc -M before clang support (but claims __GNUC__ = 3)
+	if (($predefined{__GNUC__} // -1) >= 3
+		&& !($predefined{__APPLE_CC__} && !$predefined{__clang__})) {
 	    $config{makedepprog} = $cc;
 	} else {
 	    $config{makedepprog} = which('makedepend');