diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-04 15:36:07 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 12:33:23 +0100 |
| commit | 5b14d5b5a0271ec0063d57b90f7d0b14a87c94d2 (patch) | |
| tree | 610c06416a66c098e44bb946e33db7681f49f969 /crypto/camellia | |
| parent | Touch the correct variables for the system; shlib_wrap.sh on Solaris (diff) | |
| download | openssl-5b14d5b5a0271ec0063d57b90f7d0b14a87c94d2.tar.xz openssl-5b14d5b5a0271ec0063d57b90f7d0b14a87c94d2.zip | |
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/camellia')
| -rw-r--r-- | crypto/camellia/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/camellia/Makefile.in b/crypto/camellia/Makefile.in index e809152490..cb62c91cb3 100644 --- a/crypto/camellia/Makefile.in +++ b/crypto/camellia/Makefile.in @@ -14,7 +14,7 @@ AR= ar r CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) -ASFLAGS= $(INCLUDES) $(ASFLAG) +ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile |