diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-10-21 11:11:04 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-10-31 15:46:36 +0100 |
| commit | b6e660754c2e799cffe4906269fcace0e07c73bc (patch) | |
| tree | cb742907d3aa26564fc70f5df551bbbc74f04624 /Configurations/windows-makefile.tmpl | |
| parent | ddf2e8c8ccad49cff0d6a0a0b26ca892ec4ce33a (diff) | |
Configuration: when building the dirinfo structure, include shared_sources
This makes sure that any resulting directory target in the build files
also depend on object files meant for shared libraries.
As a side effect, we move the production of the dirinfo structure from
common.tmpl to Configure, to make it easier to check the result.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7452)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index c4987f2407..6344d1862e 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -750,6 +750,10 @@ EOF lib => $libext, bin => $exeext ); + # We already have a 'test' target, and the top directory is just plain + # silly + return if $dir eq "test" || $dir eq "."; + foreach my $type (("dso", "lib", "bin", "script")) { next unless defined($unified_info{dirinfo}->{$dir}->{products}->{$type}); # For lib object files, we could update the library. However, @@ -767,7 +771,7 @@ EOF my $deps = join(" ", @deps); my $actions = join("\n", "", @actions); return <<"EOF"; -$args{dir} $args{dir}\\ : $deps$actions +$dir $dir\\ : $deps$actions EOF } "" # Important! This becomes part of the template result. |