aboutsummaryrefslogtreecommitdiff
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-04-03 14:11:12 +0200
committerRichard Levitte <levitte@openssl.org>2016-04-04 00:24:58 +0200
commit68cd4e3f993cf16adf0904a85f5b477a0094c1cf (patch)
tree2def8fa311974628205b77011302624867e808b3 /Configurations
parent51f6d88420f9289e8b3b395a709e1a0aedc8e163 (diff)
downloadopenssl-68cd4e3f993cf16adf0904a85f5b477a0094c1cf.zip
openssl-68cd4e3f993cf16adf0904a85f5b477a0094c1cf.tar.gz
openssl-68cd4e3f993cf16adf0904a85f5b477a0094c1cf.tar.bz2
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@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/unix-Makefile.tmpl2
-rw-r--r--Configurations/windows-makefile.tmpl2
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
}