@@ -32,13 +32,16 @@ $(MLKEM768_OBJS): CFLAGS += -DMLK_CONFIG_PARAMETER_SET=768
3232MLKEM1024_OBJS = $(call MAKE_OBJS,$(MLKEM1024_DIR ) ,$(SOURCES ) $(FIPS202_SRCS ) )
3333$(MLKEM1024_OBJS ) : CFLAGS += -DMLK_CONFIG_PARAMETER_SET=1024
3434
35- # Unit test object files - same sources but with MLK_STATIC_TESTABLE=
35+ # Unit test object files - same sources but with MLK_STATIC_TESTABLE= and custom heap alloc config
36+ UNIT_CFLAGS = -DMLK_STATIC_TESTABLE= -Wno-missing-prototypes \
37+ -DMLK_CONFIG_FILE=\"../test/configs/custom_heap_alloc_config.h\" -std=c11 -D_GNU_SOURCE
38+
3639MLKEM512_UNIT_OBJS = $(call MAKE_OBJS,$(MLKEM512_DIR ) /unit,$(SOURCES ) $(FIPS202_SRCS ) )
37- $(MLKEM512_UNIT_OBJS ) : CFLAGS += -DMLK_CONFIG_PARAMETER_SET=512 -DMLK_STATIC_TESTABLE= -Wno-missing-prototypes
40+ $(MLKEM512_UNIT_OBJS ) : CFLAGS += -DMLK_CONFIG_PARAMETER_SET=512 $( UNIT_CFLAGS )
3841MLKEM768_UNIT_OBJS = $(call MAKE_OBJS,$(MLKEM768_DIR ) /unit,$(SOURCES ) $(FIPS202_SRCS ) )
39- $(MLKEM768_UNIT_OBJS ) : CFLAGS += -DMLK_CONFIG_PARAMETER_SET=768 -DMLK_STATIC_TESTABLE= -Wno-missing-prototypes
42+ $(MLKEM768_UNIT_OBJS ) : CFLAGS += -DMLK_CONFIG_PARAMETER_SET=768 $( UNIT_CFLAGS )
4043MLKEM1024_UNIT_OBJS = $(call MAKE_OBJS,$(MLKEM1024_DIR ) /unit,$(SOURCES ) $(FIPS202_SRCS ) )
41- $(MLKEM1024_UNIT_OBJS ) : CFLAGS += -DMLK_CONFIG_PARAMETER_SET=1024 -DMLK_STATIC_TESTABLE= -Wno-missing-prototypes
44+ $(MLKEM1024_UNIT_OBJS ) : CFLAGS += -DMLK_CONFIG_PARAMETER_SET=1024 $( UNIT_CFLAGS )
4245
4346# Alloc test object files - same sources but with custom alloc config
4447MLKEM512_ALLOC_OBJS = $(call MAKE_OBJS,$(MLKEM512_DIR ) /alloc,$(SOURCES ) $(FIPS202_SRCS ) )
@@ -81,9 +84,13 @@ $(MLKEM512_DIR)/test/src/test_alloc.c.o: CFLAGS += -DMLK_CONFIG_FILE=\"../test/c
8184$(MLKEM768_DIR ) /test/src/test_alloc.c.o : CFLAGS += -DMLK_CONFIG_FILE=\"../test/configs/test_alloc_config.h\"
8285$(MLKEM1024_DIR ) /test/src/test_alloc.c.o : CFLAGS += -DMLK_CONFIG_FILE=\"../test/configs/test_alloc_config.h\"
8386
84- $(MLKEM512_DIR ) /bin/test_unit512 : CFLAGS += -DMLK_STATIC_TESTABLE= -Wno-missing-prototypes
85- $(MLKEM768_DIR ) /bin/test_unit768 : CFLAGS += -DMLK_STATIC_TESTABLE= -Wno-missing-prototypes
86- $(MLKEM1024_DIR ) /bin/test_unit1024 : CFLAGS += -DMLK_STATIC_TESTABLE= -Wno-missing-prototypes
87+ $(MLKEM512_DIR ) /test/src/test_unit.c.o : CFLAGS += $(UNIT_CFLAGS )
88+ $(MLKEM768_DIR ) /test/src/test_unit.c.o : CFLAGS += $(UNIT_CFLAGS )
89+ $(MLKEM1024_DIR ) /test/src/test_unit.c.o : CFLAGS += $(UNIT_CFLAGS )
90+
91+ $(MLKEM512_DIR ) /bin/test_unit512 : CFLAGS += $(UNIT_CFLAGS )
92+ $(MLKEM768_DIR ) /bin/test_unit768 : CFLAGS += $(UNIT_CFLAGS )
93+ $(MLKEM1024_DIR ) /bin/test_unit1024 : CFLAGS += $(UNIT_CFLAGS )
8794
8895# Unit library object files compiled with MLK_STATIC_TESTABLE=
8996$(MLKEM512_DIR ) /unit_% : CFLAGS += -DMLK_STATIC_TESTABLE= -Wno-missing-prototypes
0 commit comments