Skip to content

Commit e47913e

Browse files
avarttaylorr
authored andcommitted
Makefile: always (re)set DC_SHA1 on fallback
Fix an edge case introduced in in e6b07da (Makefile: make DC_SHA1 the default, 2017-03-17), when DC_SHA1 was made the default fallback we started unconditionally adding to BASIC_CFLAGS and LIB_OBJS, so we'd use the sha1collisiondetection by default. But the "DC_SHA1" variable remained unset, so e.g.: make test DC_SHA1= T=t0013*.sh Would skip the sha1collisiondetection tests, as we'd write "DC_SHA1=''" to "GIT-BUILD-OPTIONS", but if we manually removed that test prerequisite we'd pass the test (which we couldn't if we weren't using sha1collisiondetection). So let's have the fallback assignment use the 'override' directive instead of the ":=" simply expanded variable introduced in e6b07da. In this case we explicitly want to override the user's choice. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Taylor Blau <[email protected]>
1 parent 3b08839 commit e47913e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1826,7 +1826,7 @@ ifdef APPLE_COMMON_CRYPTO
18261826
COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
18271827
BASIC_CFLAGS += -DSHA1_APPLE
18281828
else
1829-
DC_SHA1 := YesPlease
1829+
override DC_SHA1 = YesPlease
18301830
BASIC_CFLAGS += -DSHA1_DC
18311831
LIB_OBJS += sha1dc_git.o
18321832
ifdef DC_SHA1_EXTERNAL

0 commit comments

Comments
 (0)