The branch master has been updated
via 850000aa414446b73163d7e723227d5fda5ed4ee (commit)
from 57ade5711b8b80c19f3d33f46d0e0acd48e68e0a (commit)
- Log -----------------------------------------------------------------
commit 850000aa414446b73163d7e723227d5fda5ed4ee
Author: Richard Levitte <[email protected]>
Date: Tue Jun 28 14:02:44 2016 +0200
Build files: don't generate empty action lines in generatedir()
Reviewed-by: Andy Polyakov <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 10 +++++-----
Configurations/windows-makefile.tmpl | 11 +++++------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index c5d59b8..20fd1d6 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1084,11 +1084,11 @@ EOF
foreach my $type (("dso", "lib", "bin", "script")) {
next unless
defined($unified_info{dirinfo}->{$dir}->{products}->{$type});
- if ($type eq "lib") {
- foreach my $lib
(@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) {
- push @actions, "";
- }
- } else {
+ # For lib object files, we could update the library. However, it
+ # was decided that it's enough to build the directory local object
+ # files, so we don't need to add any actions, and the dependencies
+ # are already taken care of.
+ if ($type ne "lib") {
foreach my $prod
(@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) {
if (dirname($prod) eq $dir) {
push @deps, $prod.$extinfo{$type};
diff --git a/Configurations/windows-makefile.tmpl
b/Configurations/windows-makefile.tmpl
index 776109f..aabf793 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -528,16 +528,15 @@ EOF
foreach my $type (("dso", "lib", "bin", "script")) {
next unless
defined($unified_info{dirinfo}->{$dir}->{products}->{$type});
- if ($type eq "lib") {
- foreach my $lib
(@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) {
- push @actions, "";
- }
- } else {
+ # For lib object files, we could update the library. However,
+ # LIB on Windows doesn't work that way, so we won't create any
+ # actions for it, and the dependencies are already taken care of.
+ if ($type ne "lib") {
foreach my $prod
(@{$unified_info{dirinfo}->{$dir}->{products}->{$type}}) {
if (dirname($prod) eq $dir) {
push @deps, $prod.$extinfo{$type};
} else {
- push @actions, "\t@ : No support to produce $type
".join(", ", @{$unified_info{dirinfo}->{$dir}->{products}->{$type}});
+ push @actions, "\t@rem No support to produce $type
".join(", ", @{$unified_info{dirinfo}->{$dir}->{products}->{$type}});
}
}
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
