3rdparty: Rename THIRDPARTY_OBJECTS

This commit is contained in:
Christoph M. Wintersteiger 2019-02-15 13:35:04 +00:00 committed by Janos Follath
parent 3ff60bcf1a
commit 2d4725f204
2 changed files with 4 additions and 4 deletions

View file

@ -3,16 +3,16 @@ EVEREST_ENABLED=$(shell perl ../scripts/config.pl -f ../include/mbedtls/config.h
ifeq ($(EVEREST_ENABLED),0) ifeq ($(EVEREST_ENABLED),0)
THIRDPARTY_INCLUDES+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib THIRDPARTY_INCLUDES+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib
THIRDPARTY_OBJECTS+= \ THIRDPARTY_CRYPTO_OBJECTS+= \
../3rdparty/everest/library/everest.o \ ../3rdparty/everest/library/everest.o \
../3rdparty/everest/library/x25519.o \ ../3rdparty/everest/library/x25519.o \
../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.o ../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.o
ifeq ($(shell getconf LONG_BIT),64) ifeq ($(shell getconf LONG_BIT),64)
THIRDPARTY_OBJECTS+=../3rdparty/everest/library/Hacl_Curve25519.o THIRDPARTY_CRYPTO_OBJECTS+=../3rdparty/everest/library/Hacl_Curve25519.o
else else
CFLAGS+="-DKRML_VERIFIED_UINT128" CFLAGS+="-DKRML_VERIFIED_UINT128"
THIRDPARTY_OBJECTS+=../3rdparty/everest/library/legacy/Hacl_Curve25519.o \ THIRDPARTY_CRYPTO_OBJECTS+=../3rdparty/everest/library/legacy/Hacl_Curve25519.o \
../3rdparty/everest/library/kremlib/FStar_UInt128_extracted.o ../3rdparty/everest/library/kremlib/FStar_UInt128_extracted.o
endif endif
endif endif

View file

@ -103,7 +103,7 @@ endif
include ../3rdparty/Makefile.inc include ../3rdparty/Makefile.inc
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
OBJS_CRYPTO+=$(THIRDPARTY_OBJECTS) OBJS_CRYPTO+=$(THIRDPARTY_CRYPTO_OBJECTS)
.SILENT: .SILENT: