When building with WITH_BREAKING_CHANGES, we need that option set before
we generate the list of binaries to build, since it affects whether
git-whatchanged is built. That in turn, affects whether t1517 passes,
since it does not if we are in breaking-changes mode and git-whatchanged
or git-pack-redundant exist. Load the configuration settings earlier in
the Makefile so that we properly honor this value when building.
Signed-off-by: brian m. carlson <redacted>
---
I noticed that Peff's patches didn't quite fix the problem for me and I
think we need this on top to make the tests pass properly.
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 98e995e4be..6bfa461aeb 100644
--- a/Makefile
+++ b/Makefile
@@ -781,6 +781,10 @@ clean-perl-script:
clean-python-script:
$(RM) $(SCRIPT_PYTHON_GEN)
+include config.mak.uname
+-include config.mak.autogen
+-include config.mak
+
SCRIPTS = $(SCRIPT_SH_GEN) \
$(SCRIPT_PERL_GEN) \
$(SCRIPT_PYTHON_GEN) \
@@ -1050,10 +1054,6 @@ GIT-SPATCH-DEFINES: FORCE
echo "$$FLAGS" >GIT-SPATCH-DEFINES; \
fi
-include config.mak.uname
--include config.mak.autogen
--include config.mak
-
ifdef DEVELOPER
include config.mak.dev
endif