From b90285184034febf6d2f24d1c4962dfc89345b04 Mon Sep 17 00:00:00 2001 From: Pengyu Lv Date: Mon, 25 Sep 2023 14:31:43 +0800 Subject: [PATCH 1/2] Fix the commands to build library In `scripts/common.make`, used by `tests/Makefile` and `programs/Makefile`, we have the following rules to build the library: ``` $(MBEDLIBS): $(MAKE) -C ../library ``` $(MBEDLIBS) contains three library files but the command is for all the 3 files instead of single target generation. This would cause a race when doing parallel build. This commit fixes command so that the recipe could generate a single library file. Fix https://github.com/Mbed-TLS/mbedtls/issues/8229 Signed-off-by: Pengyu Lv Signed-off-by: Gilles Peskine --- scripts/common.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common.make b/scripts/common.make index 0e92a668a2..3fd8e29b45 100644 --- a/scripts/common.make +++ b/scripts/common.make @@ -117,7 +117,7 @@ endif default: all $(MBEDLIBS): - $(MAKE) -C $(MBEDTLS_PATH)/library + $(MAKE) -C $(MBEDTLS_PATH)/library $(@F) neat: clean ifndef WINDOWS From 0502ba15b137d02a7f8c3ee1fe94a5b412c1edea Mon Sep 17 00:00:00 2001 From: Pengyu Lv Date: Mon, 25 Sep 2023 14:55:59 +0800 Subject: [PATCH 2/2] Fix dependencies in programs/Makefile Make fuzz depend on MBEDLIBS to avoid multiple instances for generation the library files. Signed-off-by: Pengyu Lv --- programs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/Makefile b/programs/Makefile index e765886030..a199026ade 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -125,7 +125,7 @@ SSL_OPT_APPS += test/query_compile_time_config test/udp_proxy ssl-opt: $(patsubst %,%$(EXEXT),$(SSL_OPT_APPS)) .PHONY: ssl-opt -fuzz: ${MBEDTLS_TEST_OBJS} +fuzz: ${MBEDLIBS} ${MBEDTLS_TEST_OBJS} $(MAKE) -C fuzz ${MBEDTLS_TEST_OBJS}: