[PATCH] Makefile: allow NO_DC_SHA1_SUBMODULE to be set in config.mak
From: Ramsay Jones <hidden>
Date: 2017-12-12 14:06:10
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
Signed-off-by: Ramsay Jones <redacted> --- Hi Junio, Could you please add (or squash) this on top of the 'ab/sha1dc-build' branch, so that I can build with NO_DC_SHA1_SUBMODULE=NoThanks in my config.mak. [If I were to get a vote, I would vote no to the submodule. ;-) ] Thanks! ATB, Ramsay Jones Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 929b49b04..91bbb0ed8 100644
--- a/Makefile
+++ b/Makefile@@ -1042,6 +1042,10 @@ EXTLIBS = GIT_USER_AGENT = git/$(GIT_VERSION) +include config.mak.uname +-include config.mak.autogen +-include config.mak + ifndef NO_DC_SHA1_SUBMODULE ifndef DC_SHA1_EXTERNAL ifneq ($(wildcard sha1collisiondetection/lib/sha1.h),sha1collisiondetection/lib/sha1.h)
@@ -1053,10 +1057,6 @@ whatever reason define NO_DC_SHA1_SUBMODULE=NoThanks) endif endif -include config.mak.uname --include config.mak.autogen --include config.mak - ifdef DEVELOPER CFLAGS += $(DEVELOPER_CFLAGS) endif
--
2.15.0