Skip to content

Commit

Permalink
3rdparty: Rename THIRDPARTY_OBJECTS
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph M. Wintersteiger authored and yanesca committed Aug 19, 2019
1 parent 3ff60bc commit 2d4725f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions 3rdparty/everest/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ EVEREST_ENABLED=$(shell perl ../scripts/config.pl -f ../include/mbedtls/config.h
ifeq ($(EVEREST_ENABLED),0)
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/x25519.o \
../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.o

ifeq ($(shell getconf LONG_BIT),64)
THIRDPARTY_OBJECTS+=../3rdparty/everest/library/Hacl_Curve25519.o
THIRDPARTY_CRYPTO_OBJECTS+=../3rdparty/everest/library/Hacl_Curve25519.o
else
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
endif
endif
Expand Down
2 changes: 1 addition & 1 deletion library/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ endif

include ../3rdparty/Makefile.inc
LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES)
OBJS_CRYPTO+=$(THIRDPARTY_OBJECTS)
OBJS_CRYPTO+=$(THIRDPARTY_CRYPTO_OBJECTS)

.SILENT:

Expand Down

0 comments on commit 2d4725f

Please sign in to comment.