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

[Andy Polyakov]

The branch OpenSSL_1_1_0-stable has been updated
       via  3daecf16bdff4fc2303907d44ff651a52facbd89 (commit)
      from  d020a65a03ec10b9f7a6415ec89759c385a37d3a (commit)


- Log -----------------------------------------------------------------
commit 3daecf16bdff4fc2303907d44ff651a52facbd89
Author: Andy Polyakov <ap...@openssl.org>
Date:   Wed Aug 30 16:28:16 2017 +0200

    Configure: base compiler-specific decisions on pre-defines.
    
    The commit subject is a bit misleading in sense that decisions affect
    only gcc and gcc-alikes, like clang, recent icc...
    
    This is back-port of 54cf3b981afcbbd3754c8ba1114ab6a658d86c08, GH#4281.
    
    Reviewed-by: Rich Salz <rs...@openssl.org>

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

Summary of changes:
 Configure | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/Configure b/Configure
index 33d2392..6eb503c 100755
--- a/Configure
+++ b/Configure
@@ -1223,29 +1223,29 @@ unless ($disabled{asm}) {
     }
 }
 
-my $ecc = $target{cc};
-if ($^O ne "VMS" && !$disabled{makedepend}) {
-    # Is the compiler gcc or clang?  $ecc is used below to see if
-    # error-checking can be turned on.
-    my $ccpcc = "$config{cross_compile_prefix}$target{cc}";
-    open(PIPE, "$ccpcc --version 2>&1 |");
-    my $lines = 2;
-    while ( <PIPE> ) {
-        # Find the version number and save the major.
-        m|(?:.*)\b(\d+)\.\d+\.\d+\b(?:.*)|;
-        my $compiler_major = $1;
-        # We know that GNU C version 3 and up as well as all clang
-        # versions support dependency generation
-        $config{makedepprog} = $ccpcc
-            if (/clang/ || (/gcc/ && $compiler_major >= 3));
-        $ecc = "clang" if /clang/;
-        $ecc = "gcc" if /gcc/;
-        last if ($config{makedepprog} || !$lines--);
+my %predefined;
+
+if ($^O ne "VMS") {
+    my $cc = "$config{cross_compile_prefix}$target{cc}";
+
+    # collect compiler pre-defines from gcc or gcc-alike...
+    open(PIPE, "$cc -dM -E -x c /dev/null 2>&1 |");
+    while (<PIPE>) {
+       m/^#define\s+(\w+(?:\(\w+\))?)(?:\s+(.+))?/ or last;
+       $predefined{$1} = $2 // "";
     }
     close(PIPE);
 
-    $config{makedepprog} = which('makedepend') unless $config{makedepprog};
-    $disabled{makedepend} = "unavailable" unless $config{makedepprog};
+    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) {
+           $config{makedepprog} = $cc;
+       } else {
+           $config{makedepprog} = which('makedepend');
+           $disabled{makedepend} = "unavailable" unless $config{makedepprog};
+       }
+    }
 }
 
 
@@ -1290,13 +1290,13 @@ if (defined($config{api})) {
 if ($strict_warnings)
        {
        my $wopt;
-       die "ERROR --strict-warnings requires gcc or clang"
-            unless $ecc eq 'gcc' || $ecc eq 'clang';
+       die "ERROR --strict-warnings requires gcc or gcc-alike"
+            unless defined($predefined{__GNUC__});
        foreach $wopt (split /\s+/, $gcc_devteam_warn)
                {
                $config{cflags} .= " $wopt" unless ($config{cflags} =~ 
/(?:^|\s)$wopt(?:\s|$)/)
                }
-       if ($ecc eq "clang")
+       if (defined($predefined{__clang__}))
                {
                foreach $wopt (split /\s+/, $clang_devteam_warn)
                        {
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits