Fix Make issues with Everest enabled
Apply Gilles suggestion to fix the problem with make on the CI when everest is enabled, i.e. use $(THIRDPARTY_DIR) instead of a fuzz specific hack involving $(THIRDPARTY_INCLUDES) Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
parent
7fd162ec26
commit
0c847bcbe7
3 changed files with 8 additions and 8 deletions
8
3rdparty/everest/Makefile.inc
vendored
8
3rdparty/everest/Makefile.inc
vendored
|
@ -1,6 +1,6 @@
|
||||||
THIRDPARTY_INCLUDES+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib
|
THIRDPARTY_INCLUDES+=-I$(THIRDPARTY_DIR)/everest/include -I$(THIRDPARTY_DIR)/everest/include/everest -I$(THIRDPARTY_DIR)/everest/include/everest/kremlib
|
||||||
|
|
||||||
THIRDPARTY_CRYPTO_OBJECTS+= \
|
THIRDPARTY_CRYPTO_OBJECTS+= \
|
||||||
../3rdparty/everest/library/everest.o \
|
$(THIRDPARTY_DIR)/everest/library/everest.o \
|
||||||
../3rdparty/everest/library/x25519.o \
|
$(THIRDPARTY_DIR)/everest/library/x25519.o \
|
||||||
../3rdparty/everest/library/Hacl_Curve25519_joined.o
|
$(THIRDPARTY_DIR)/everest/library/Hacl_Curve25519_joined.o
|
||||||
|
|
6
3rdparty/p256-m/Makefile.inc
vendored
6
3rdparty/p256-m/Makefile.inc
vendored
|
@ -1,5 +1,5 @@
|
||||||
THIRDPARTY_INCLUDES+=-I../3rdparty/p256-m/p256-m/include -I../3rdparty/p256-m/p256-m/include/p256-m -I../3rdparty/p256-m/p256-m_driver_interface
|
THIRDPARTY_INCLUDES+=-I$(THIRDPARTY_DIR)/p256-m/p256-m/include -I$(THIRDPARTY_DIR)/p256-m/p256-m/include/p256-m -I$(THIRDPARTY_DIR)/p256-m/p256-m_driver_interface
|
||||||
|
|
||||||
THIRDPARTY_CRYPTO_OBJECTS+= \
|
THIRDPARTY_CRYPTO_OBJECTS+= \
|
||||||
../3rdparty/p256-m//p256-m_driver_entrypoints.o \
|
$(THIRDPARTY_DIR)/p256-m//p256-m_driver_entrypoints.o \
|
||||||
../3rdparty/p256-m//p256-m/p256-m.o
|
$(THIRDPARTY_DIR)/p256-m//p256-m/p256-m.o
|
||||||
|
|
|
@ -114,7 +114,7 @@ all: fuzz
|
||||||
endif
|
endif
|
||||||
|
|
||||||
fuzz: ${MBEDTLS_TEST_OBJS}
|
fuzz: ${MBEDTLS_TEST_OBJS}
|
||||||
$(MAKE) -C fuzz THIRDPARTY_INCLUDES=$(THIRDPARTY_INCLUDES)
|
$(MAKE) -C fuzz
|
||||||
|
|
||||||
${MBEDTLS_TEST_OBJS}:
|
${MBEDTLS_TEST_OBJS}:
|
||||||
$(MAKE) -C ../tests mbedtls_test
|
$(MAKE) -C ../tests mbedtls_test
|
||||||
|
|
Loading…
Reference in a new issue