diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-10-04 17:41:12 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-10-05 08:22:42 +0200 |
| commit | 66a24ab86816c240279d238aca41c68d57ead35c (patch) | |
| tree | ebfcac2ce4f4993bb078ea000fe8c0ccce5ba356 /Configurations/common.tmpl | |
| parent | ed57d89bd18f6f4b3db52567f9a718c31d717aa8 (diff) | |
Add build file support for generic symbol exports with DSOs
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7347)
Diffstat (limited to 'Configurations/common.tmpl')
| -rw-r--r-- | Configurations/common.tmpl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index dffa513f22..c1c96a2b4e 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -78,6 +78,7 @@ if ref $unified_info{generate}->{$src} eq ""; my $script = $unified_info{generate}->{$src}->[0]; $OUT .= generatesrc(src => $src, + product => $bin, generator => $unified_info{generate}->{$src}, generator_incs => $unified_info{includes}->{$script}, generator_deps => $unified_info{depends}->{$script}, @@ -159,7 +160,13 @@ deps => [ resolvedepends($lib) ], installed => is_installed($lib)); foreach (@{$unified_info{shared_sources}->{$lib}}) { - doobj($_, $lib, intent => "dso", installed => is_installed($lib)); + # If this is somehow a compiled object, take care of it that way + # Otherwise, it might simply be generated + if (defined $unified_info{sources}->{$_}) { + doobj($_, $lib, intent => "dso", installed => is_installed($lib)); + } else { + dogenerate($_, undef, $lib, intent => "dso"); + } } $cache{$lib} = 1; } |