diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-10-04 00:08:01 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-10-10 14:12:15 +0200 |
| commit | e805c2d6d36d6be3db8141abc98f3ce5c6fa9776 (patch) | |
| tree | 57f267f341a32b67ca2392be4b9723edbe680a0a /Configurations/platform | |
| parent | bdea50ca802f7645774a359960e3b6ee9c352921 (diff) | |
Build files: Make it possible to source libraries into other libraries
Added functionality to use static libraries as source for other
libraries. When done this way, the target library will use the object
files from the sourced static libraries, making the sourced libraries
work as "containers" for object files.
We also need to make sure that the Unix Makefile template knows how to
deal with shared libraries and modules that depend on static libraries.
That's new situation we haven't had before.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10088)
Diffstat (limited to 'Configurations/platform')
| -rw-r--r-- | Configurations/platform/BASE.pm | 10 | ||||
| -rw-r--r-- | Configurations/platform/mingw.pm | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Configurations/platform/BASE.pm b/Configurations/platform/BASE.pm index fcd7b70ccf..1ab4bf18e9 100644 --- a/Configurations/platform/BASE.pm +++ b/Configurations/platform/BASE.pm @@ -52,11 +52,13 @@ sub isdef { return $_[1] =~ m|\.ld$|; } sub isobj { return $_[1] =~ m|\.o$|; } sub isres { return $_[1] =~ m|\.res$|; } sub isasm { return $_[1] =~ m|\.[Ss]$|; } +sub isstaticlib { return $_[1] =~ m|\.a$|; } sub convertext { - if ($_[0]->isdef($_[1])) { return $_[0]->def($_[1]); } - if ($_[0]->isobj($_[1])) { return $_[0]->obj($_[1]); } - if ($_[0]->isres($_[1])) { return $_[0]->res($_[1]); } - if ($_[0]->isasm($_[1])) { return $_[0]->asm($_[1]); } + if ($_[0]->isdef($_[1])) { return $_[0]->def($_[1]); } + if ($_[0]->isobj($_[1])) { return $_[0]->obj($_[1]); } + if ($_[0]->isres($_[1])) { return $_[0]->res($_[1]); } + if ($_[0]->isasm($_[1])) { return $_[0]->asm($_[1]); } + if ($_[0]->isstaticlib($_[1])) { return $_[0]->staticlib($_[1]); } return $_[1]; } diff --git a/Configurations/platform/mingw.pm b/Configurations/platform/mingw.pm index 5788a36e77..7dacb32a31 100644 --- a/Configurations/platform/mingw.pm +++ b/Configurations/platform/mingw.pm @@ -17,6 +17,9 @@ sub objext { '.obj' } sub libext { '.a' } sub dsoext { '.dll' } sub defext { '.def' } + +# Other extra that aren't defined in platform::BASE +sub resext { '.res.obj' } sub shlibext { '.dll' } sub shlibextimport { $target{shared_import_extension} || '.dll.a' } sub shlibextsimple { undef } |