[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Andy Polyakov]

The branch OpenSSL_1_0_2-stable has been updated
       via  1b3af972c0ea6435ce7ac897de9f7c0f138e05a7 (commit)
      from  bd05644df71602f76db5335b8077ba4dbbb6b427 (commit)


- Log -----------------------------------------------------------------
commit 1b3af972c0ea6435ce7ac897de9f7c0f138e05a7
Author: Todd Short <tsh...@akamai.com>
Date:   Mon Apr 23 14:06:22 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: Andy Polyakov <ap...@openssl.org>
    Reviewed-by: Rich Salz <rs...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6073)

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

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

diff --git a/Configure b/Configure
index 744b493..9c1879e 100755
--- a/Configure
+++ b/Configure
@@ -1671,6 +1671,13 @@ while (<PIPE>) {
 }
 close(PIPE);
 
+# Xcode did not handle $cc -M before clang support
+my $cc_as_makedepend = 0;
+if ($predefined{__GNUC__} >= 3 && !(defined($predefined{__APPLE_CC__})
+                                    && !defined($predefined{__clang__}))) {
+  $cc_as_makedepend = 1;
+}
+
 if ($strict_warnings)
        {
        my $wopt;
@@ -1730,14 +1737,14 @@ while (<IN>)
                s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;
                s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;
                s/^RC=\s*/RC= \$\(CROSS_COMPILE\)/;
-               s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if 
$predefined{__GNUC__} >= 3;
+               s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if 
$cc_as_makedepend;
                }
        else    {
                s/^CC=.*$/CC= $cc/;
                s/^AR=\s*ar/AR= $ar/;
                s/^RANLIB=.*/RANLIB= $ranlib/;
                s/^RC=.*/RC= $windres/;
-               s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $predefined{__GNUC__} 
>= 3;
+               s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc_as_makedepend;
                }
        s/^CFLAG=.*$/CFLAG= $cflags/;
        s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits