[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  fb044341e67413ad6bc0d3788ab1269e0ed703ad (commit)
       via  39affe19dcbc00d1e5435957fc7c8be65cc853a4 (commit)
      from  256ed966d310239cbfa2b09e732fbda55ef75ca5 (commit)


- Log -----------------------------------------------------------------
commit fb044341e67413ad6bc0d3788ab1269e0ed703ad
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 10 19:34:21 2016 +0100

    In the recipe using "makedepend", make sure the object file extension is there
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit 39affe19dcbc00d1e5435957fc7c8be65cc853a4
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 10 19:33:11 2016 +0100

    Configure - don't trust $1 to stick around, save its value away
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 Configurations/unix-Makefile.tmpl | 2 +-
 Configure                         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 114a4be..20fc076 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -884,7 +884,7 @@ EOF
           $recipe .= <<"EOF";
 $obj$depext: $deps
 	rm -f \$\@.tmp; touch \$\@.tmp
-	-\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj" -- \$(CFLAGS) $ecflags$incs -- $srcs \\
+	-\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\
 	    2>/dev/null
 	sed -e 's/^.*|//' -e 's/ \\/\\(\\\\.\\|[^ ]\\)*//g' -e '/: *\$\$/d' -e '/^\\(#.*\\| *\\)\$\$/d' \$\@.tmp > \$\@
 	rm \$\@.tmp
diff --git a/Configure b/Configure
index 2b621f5..9b14579 100755
--- a/Configure
+++ b/Configure
@@ -1105,9 +1105,11 @@ if ($^O ne "VMS" && !$disabled{makedepend}) {
     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/ && $1 > 3);
+        $config{makedepprog} = $ccpcc
+            if /clang/ || (/gcc/ && $compiler_major > 3);
         $ecc = "clang" if /clang/;
         $ecc = "gcc" if /gcc/;
     }