[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  68cd4e3f993cf16adf0904a85f5b477a0094c1cf (commit)
      from  51f6d88420f9289e8b3b395a709e1a0aedc8e163 (commit)


- Log -----------------------------------------------------------------
commit 68cd4e3f993cf16adf0904a85f5b477a0094c1cf
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Apr 3 14:11:12 2016 +0200

    Makefile et al template: only modify static library with new object files
    
    Previously, we updated the static libraries (libcrypto.a on Unix,
    libcrypto.lib on Windows) with all the object files, regardless of if
    they were rebuilt or not.  With this change, we only update them with
    the object files were rebuilt.
    
    NOTE: this does not apply on VMS, as the expansion of $? may be too
    large for a command line.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 5b9a23f..8da9a4c 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -981,7 +981,7 @@ EOF
       my $objs = join(" ", map { $_.$objext } @{$args{objs}});
       return <<"EOF";
 $lib$libext: $objs
-	\$(AR) \$\@ $objs
+	\$(AR) \$\@ \$\?
 	\$(RANLIB) \$\@ || echo Never mind.
 EOF
   }
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 00149c3..b4672ab 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -404,7 +404,7 @@ EOF
      return <<"EOF";
 $lib$libext: $deps
 	\$(AR) \$(ARFLAGS) \$(AROUTFLAG)$lib$libext @<<
-$objs
+\$\?
 <<
 EOF
  }