On Tue, Dec 12, 2017 at 8:53 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> writes: > >> Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> >> --- >> >> 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. > > Makes sense. The patch looks scary by appearing to move the > includes far to the front of the Makefile, but it in fact is moving > the NO_DC_SHA1_SUBMODULE block slightly down and it is a sensible > and safe move. > > I actually think that the block can go even further down, perhaps > close to the run of choices "what variant are we building?" we make > at around we have "ifdef NO_CURL". > > Ævar? Makes sense to me, do you want to squash this + your proposed edit & I'll pick it up if there's another version, or I can re-submit. >> 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
