summaryrefslogtreecommitdiff
path: root/crypto/chacha
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-03-04 15:36:07 +0100
committerRichard Levitte <levitte@openssl.org>2016-03-09 12:33:23 +0100
commit5b14d5b5a0271ec0063d57b90f7d0b14a87c94d2 (patch)
tree610c06416a66c098e44bb946e33db7681f49f969 /crypto/chacha
parenta772e9d01a81dae132cb03107292b3ecc725e5af (diff)
downloadopenssl-new-5b14d5b5a0271ec0063d57b90f7d0b14a87c94d2.tar.gz
Make sure the effect of "pic" / "no-pic" is used with assembler compilations
Before the 'Introduce the "pic" / "no-pic" config option' commit, the shared_cflag value for the chosen config would be part of the make variable CFLAG, which got replicated into CFLAGS and ASFLAGS. Since said commit, the shared_cflag value has become a make variable of its own, SHARED_CFLAG (which is left empty in a "no-pic" build). However, ASFLAGS was forgotten. That's what's corrected with this change. Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/chacha')
-rw-r--r--crypto/chacha/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/chacha/Makefile.in b/crypto/chacha/Makefile.in
index c34224cfc6..e728b4d93b 100644
--- a/crypto/chacha/Makefile.in
+++ b/crypto/chacha/Makefile.in
@@ -13,7 +13,7 @@ AR= ar r
CHACHA_ENC=chacha_enc.o
CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)
-ASFLAGS= $(INCLUDES) $(ASFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)
AFLAGS= $(ASFLAGS)
GENERAL=Makefile