Commit 5b14d5b5 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
parent a772e9d0

crypto/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ PLIB_LDFLAG= 
EX_LIBS=



CFLAGS= $(INCLUDE) $(CFLAG) $(SHARED_CFLAG)

ASFLAGS= $(INCLUDE) $(ASFLAG)

ASFLAGS= $(INCLUDE) $(ASFLAG) $(SHARED_CFLAG)

AFLAGS=$(ASFLAGS)

CPUID_OBJ=mem_clr.o

UPLINK_OBJ=

crypto/aes/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ AR= ar r 
AES_ENC=aes_core.o aes_cbc.o



CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)

ASFLAGS= $(INCLUDES) $(ASFLAG)

ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)

AFLAGS= $(ASFLAGS)



GENERAL=Makefile

crypto/bf/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ AR= ar r 
BF_ENC=		bf_enc.o



CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)

ASFLAGS= $(INCLUDES) $(ASFLAG)

ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)

AFLAGS= $(ASFLAGS)



GENERAL=Makefile

crypto/bn/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ AR= ar r 
BN_ASM=		bn_asm.o



CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG)

ASFLAGS= $(INCLUDES) $(ASFLAG)

ASFLAGS= $(INCLUDES) $(ASFLAG) $(SHARED_CFLAG)

AFLAGS= $(ASFLAGS)



GENERAL=Makefile

crypto/camellia/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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