diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-19 22:08:37 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-20 16:51:31 +0100 |
| commit | 343ec2b083b82ccf9ce96020bc95320390296f1f (patch) | |
| tree | e159c94c1ebe2bb60fec21911c095b74e15865fe /Makefile.in | |
| parent | 45502bfe19fb03c9f343b03fa6434ee0bece8428 (diff) | |
Build dynamic engines even if configured "no-shared"
Until now, the engines in engines/ were only built as dynamicaly
loadable ones if shared libraries were built.
We not dissociate the two and can build dynamicaly loadable engines
even if we only build static libcrypto and libssl. This is controlled
with the option (enable|disable|no)-static-engine, defaulting to
no-static-engine.
Note that the engines in crypto/engine/ (dynamic and cryptodev) will
always be built into libcrypto.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index c269a6d20a..9cca221cdd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -210,6 +210,7 @@ SHARED_LDFLAG={- $target{shared_ldflag} . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$| ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -} SHARED_RCFLAG={- $target{shared_rcflag} -} +DYNAMIC_ENGINES={- $config{dynamic_engines} -} GENERAL= Makefile BASENAME= openssl @@ -254,7 +255,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ AS='$(CC)' ASFLAG='$(CFLAG) -c' \ AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ CROSS_COMPILE='$(CROSS_COMPILE)' \ - PERL='$(PERL)' \ + PERL='$(PERL)' DYNAMIC_ENGINES='$(DYNAMIC_ENGINES)' \ SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \ DESTDIR='$(DESTDIR)' \ INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \ |