tests: Fix new fuzzer builds

$(LIBS) got included twice into the linker command line from $^ and
$(LIBS). The former ended up getting converted based on host CPU rather
than target. Fix that by removing duplication and -lcrypto from $(LIBS).

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-04-22 00:51:13 +03:00 committed by Jouni Malinen
parent 60a2de5683
commit de3f8d9fd1
2 changed files with 2 additions and 4 deletions

View file

@ -13,7 +13,6 @@ LIBS += $(SRC)/common/libcommon.a
LIBS += $(SRC)/utils/libutils.a LIBS += $(SRC)/utils/libutils.a
OBJS += $(SRC)/crypto/crypto_openssl.o OBJS += $(SRC)/crypto/crypto_openssl.o
LIBS += -lcrypto
OBJS += $(SRC)/crypto/aes-ctr.o OBJS += $(SRC)/crypto/aes-ctr.o
OBJS += $(SRC)/crypto/aes-siv.o OBJS += $(SRC)/crypto/aes-siv.o
@ -24,7 +23,7 @@ OBJS += $(SRC)/tls/asn1.o
OBJS += $(SRC)/common/dpp.o OBJS += $(SRC)/common/dpp.o
dpp-uri: dpp-uri.o $(OBJS) $(LIBS) dpp-uri: dpp-uri.o $(OBJS) $(LIBS)
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDO) $(LDFLAGS) -o $@ $^ -lcrypto
clean: clean:
$(MAKE) -C $(SRC) clean $(MAKE) -C $(SRC) clean

View file

@ -8,14 +8,13 @@ LIBS += $(SRC)/common/libcommon.a
LIBS += $(SRC)/utils/libutils.a LIBS += $(SRC)/utils/libutils.a
OBJS += $(SRC)/crypto/crypto_openssl.o OBJS += $(SRC)/crypto/crypto_openssl.o
LIBS += -lcrypto
OBJS += $(SRC)/crypto/dh_groups.o OBJS += $(SRC)/crypto/dh_groups.o
OBJS += $(SRC)/crypto/sha256-prf.o OBJS += $(SRC)/crypto/sha256-prf.o
OBJS += $(SRC)/crypto/sha256-kdf.o OBJS += $(SRC)/crypto/sha256-kdf.o
OBJS += $(SRC)/common/dragonfly.o OBJS += $(SRC)/common/dragonfly.o
sae: sae.o $(OBJS) $(LIBS) sae: sae.o $(OBJS) $(LIBS)
$(LDO) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDO) $(LDFLAGS) -o $@ $^ -lcrypto
clean: clean:
$(MAKE) -C $(SRC) clean $(MAKE) -C $(SRC) clean