Skip to content

Commit e7b035e

Browse files
authored
Merge pull request #10532 from gilles-peskine-arm/race-condition-in-makefile-4.0
Fix race condition in makefile affecting test_sha3_variations
2 parents 8f66d59 + d86c4ae commit e7b035e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

programs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ SSL_OPT_APPS += test/query_compile_time_config test/udp_proxy
101101
ssl-opt: $(patsubst %,%$(EXEXT),$(SSL_OPT_APPS))
102102
.PHONY: ssl-opt
103103

104-
fuzz: ${MBEDTLS_TEST_OBJS}
104+
fuzz: ${MBEDLIBS} ${MBEDTLS_TEST_OBJS}
105105
$(MAKE) -C fuzz
106106

107107
${MBEDTLS_TEST_OBJS}:

scripts/common.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ endif
140140
default: all
141141

142142
$(MBEDLIBS):
143-
$(MAKE) -C $(MBEDTLS_PATH)/library
143+
$(MAKE) -C $(MBEDTLS_PATH)/library $(@F)
144144

145145
neat: clean
146146
ifndef WINDOWS

0 commit comments

Comments
 (0)