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 /engines | |
| 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 'engines')
| -rw-r--r-- | engines/Makefile.in | 2 | ||||
| -rw-r--r-- | engines/build.info | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/Makefile.in b/engines/Makefile.in index ea2ae2cd1b..d07cc0f841 100644 --- a/engines/Makefile.in +++ b/engines/Makefile.in @@ -57,7 +57,7 @@ top: all: lib lib: $(LIBOBJ) $(TESTLIBOBJ) - @if [ -n "$(SHARED_LIBS)" ]; then \ + @if [ "$(DYNAMIC_ENGINES)" = 1 ]; then \ set -e; \ for l in $(LIBNAMES) $(TESTLIBNAMES); do \ $(MAKE) -f ../Makefile.shared -e \ diff --git a/engines/build.info b/engines/build.info index cae49862ed..98f0e58ee9 100644 --- a/engines/build.info +++ b/engines/build.info @@ -1,5 +1,5 @@ {- use File::Spec::Functions qw/:DEFAULT rel2abs/; -} -IF[{- $config{no_shared} -}] +IF[{- !$config{dynamic_engines} -}] LIBS=../libcrypto SOURCE[../libcrypto]=\ e_padlock.c {- $target{padlock_asm_src} -} \ |