summaryrefslogtreecommitdiffstats
path: root/engines/build.info
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-03-05 18:38:16 +0100
committerRichard Levitte <levitte@openssl.org>2019-03-05 20:53:15 +0100
commit7120f1e7c74c8220f43fd28ac7303c0cab29dabe (patch)
tree899cc4a26ad18585e69e2ccdfd406a07ef519e79 /engines/build.info
parentDon't write the tick_identity to the session (diff)
downloadopenssl-7120f1e7c74c8220f43fd28ac7303c0cab29dabe.tar.xz
openssl-7120f1e7c74c8220f43fd28ac7303c0cab29dabe.zip
padlock: generate assembler source for static libraries too
The GENERATE lines for generating the padlock assembler source were wrongly placed in such a way that they only applied to the shared library build. [extended tests] Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> (Merged from https://github.com/openssl/openssl/pull/8412)
Diffstat (limited to 'engines/build.info')
-rw-r--r--engines/build.info6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/build.info b/engines/build.info
index e5001c452c..16907da50a 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -20,9 +20,6 @@ IF[{- !$disabled{"engine"} -}]
SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}
DEPEND[padlock]=../libcrypto
INCLUDE[padlock]=../include
- GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl \
- $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)
- GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)
IF[{- defined $target{shared_defflag} -}]
SHARED_SOURCE[padlock]=padlock.ld
GENERATE[padlock.ld]=../util/engines.num
@@ -75,4 +72,7 @@ IF[{- !$disabled{"engine"} -}]
GENERATE[ossltest.ld]=../util/engines.num
ENDIF
ENDIF
+ GENERATE[e_padlock-x86.s]=asm/e_padlock-x86.pl \
+ $(PERLASM_SCHEME) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(PROCESSOR)
+ GENERATE[e_padlock-x86_64.s]=asm/e_padlock-x86_64.pl $(PERLASM_SCHEME)
ENDIF