diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-11-07 11:10:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-01-22 12:35:39 +0100 |
| commit | 5f8257494c72ba4ea2a99d693916798517a610e1 (patch) | |
| tree | 63c598166321263624859fef617f238224c498a0 /Configurations | |
| parent | 994e86a9ffd4195f08a7b0ce61bf001e3bebf891 (diff) | |
| download | openssl-5f8257494c72ba4ea2a99d693916798517a610e1.zip openssl-5f8257494c72ba4ea2a99d693916798517a610e1.tar.gz openssl-5f8257494c72ba4ea2a99d693916798517a610e1.tar.bz2 | |
Build: pass attributes down to make rule generators
For good measure, we pass down attributes when calling obj2shlib,
obj2lib, obj2dso, obj2bin, or in2script. We currently don't use them
in our build file templates, but might as well for future use.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7581)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/common.tmpl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index 9e07a6f..132852c 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -130,6 +130,7 @@ unless ($disabled{shared} || $lib =~ /\.a$/) { my $obj2shlib = defined &obj2shlib ? \&obj2shlib : \&libobj2shlib; $OUT .= $obj2shlib->(lib => $lib, + attrs => $unified_info{attributes}->{$lib}, objs => $unified_info{shared_sources}->{$lib}, deps => [ reducedepends(resolvedepends($lib)) ], installed => is_installed($lib)); @@ -145,6 +146,7 @@ } } $OUT .= obj2lib(lib => $lib, + attrs => $unified_info{attributes}->{$lib}, objs => [ @{$unified_info{sources}->{$lib}} ]); foreach (@{$unified_info{sources}->{$lib}}) { doobj($_, $lib, intent => "lib", installed => is_installed($lib)); @@ -159,6 +161,7 @@ my $lib = shift; return "" if $cache{$lib}; $OUT .= obj2dso(lib => $lib, + attrs => $unified_info{attributes}->{$lib}, objs => $unified_info{shared_sources}->{$lib}, deps => [ resolvedepends($lib) ], installed => is_installed($lib)); @@ -181,6 +184,7 @@ return "" if $cache{$bin}; my $deps = [ reducedepends(resolvedepends($bin)) ]; $OUT .= obj2bin(bin => $bin, + attrs => $unified_info{attributes}->{$bin}, objs => [ @{$unified_info{sources}->{$bin}} ], deps => $deps, installed => is_installed($bin)); @@ -196,6 +200,7 @@ my $script = shift; return "" if $cache{$script}; $OUT .= in2script(script => $script, + attrs => $unified_info{attributes}->{$script}, sources => $unified_info{sources}->{$script}, installed => is_installed($script)); $cache{$script} = 1; |