summaryrefslogtreecommitdiffstats
path: root/crypto/chacha
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-01-23 13:54:55 +0100
committerRichard Levitte <levitte@openssl.org>2018-01-28 07:26:10 +0100
commit8c3bc594e0c74926bfefb84b8bae8a2fac82e465 (patch)
tree7875c47a8ecd68f42f701e6f3602a8cc0c4fe0dc /crypto/chacha
parentdf05f155a69b96b174e0e47bc689bf729de684b6 (diff)
Processing GNU-style "make variables" - separate CPP flags from C flags
C preprocessor flags get separated from C flags, which has the advantage that we don't get loads of macro definitions and inclusion directory specs when linking shared libraries, DSOs and programs. This is a step to add support for "make variables" when configuring. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5177)
Diffstat (limited to 'crypto/chacha')
-rw-r--r--crypto/chacha/build.info4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info
index f99114c135..a33386cb6f 100644
--- a/crypto/chacha/build.info
+++ b/crypto/chacha/build.info
@@ -1,7 +1,9 @@
LIBS=../../libcrypto
SOURCE[../../libcrypto]={- $target{chacha_asm_src} -}
-GENERATE[chacha-x86.s]=asm/chacha-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
+GENERATE[chacha-x86.s]=asm/chacha-x86.pl \
+ $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(CPPFLAGS) $(LIB_CPPFLAGS) \
+ $(PROCESSOR)
GENERATE[chacha-x86_64.s]=asm/chacha-x86_64.pl $(PERLASM_SCHEME)
GENERATE[chacha-ppc.s]=asm/chacha-ppc.pl $(PERLASM_SCHEME)
GENERATE[chacha-armv4.S]=asm/chacha-armv4.pl $(PERLASM_SCHEME)