[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  30752dd7df7c699b380043cb73e384dd84cab539 (commit)
      from  dca5c70121e75774feb7d5e2ac6e453e8675645b (commit)


- Log -----------------------------------------------------------------
commit 30752dd7df7c699b380043cb73e384dd84cab539
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 8 17:16:16 2016 +0100

    Check gcc version to see if it supports -MM and friends
    
    According to manuals found here: https://gcc.gnu.org/onlinedocs/, GNU
    C version 3 and on support the dependency generation options.  We
    therefore need to check the gcc version to see if we're going to use
    it or makedepend for dependency generation.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 Configure | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 17f45b0..fa1272b 100755
--- a/Configure
+++ b/Configure
@@ -1104,7 +1104,11 @@ if ($^O ne "VMS" && !$disabled{makedepend}) {
     $config{makedepprog} = which('makedepend');
     open(PIPE, "$ccpcc --version 2>&1 | head -2 |");
     while ( <PIPE> ) {
-        $config{makedepprog} = $ccpcc if /clang|gcc/;
+        # Find the version number and save the major.
+        m|(?:.*)\b(\d+)\.\d+\.\d+\b(?:.*)|;
+        # We know that GNU C version 3 and up as well as all clang
+        # versions support dependency generation
+        $config{makedepprog} = $ccpcc if /clang/ || (/gcc/ && $1 > 3);
         $ecc = "clang" if /clang/;
         $ecc = "gcc" if /gcc/;
     }