summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-12-07 05:32:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-07 08:41:51 (GMT)
commitac10a85785baee56bb4a04ad5f847d15ffba0893 (patch)
treeedc6dfc6483cbcdfced2a8c6271d74323f4edda8 /Makefile
parent53970b92d9dc883669f3a9b79b5e39e73931b331 (diff)
downloadgit-ac10a85785baee56bb4a04ad5f847d15ffba0893.zip
git-ac10a85785baee56bb4a04ad5f847d15ffba0893.tar.gz
git-ac10a85785baee56bb4a04ad5f847d15ffba0893.tar.bz2
tests: handle NO_PYTHON setting
Without this, test-lib checks that the git_remote_helpers directory has been built. However, if we are building without python, we will not have done anything at all in that directory, and test-lib's sanity check will fail. We bump the inclusion of GIT-BUILD-OPTIONS further up in test-lib; it contains configuration, and as such should be read before we do any checks (and in this particular case, we need its value to do our check properly). Signed-off-by: Jeff King <peff@peff.net> Looks-fine-to-me-by: Brandon Casey <brandon.casey.ctr@nrlssc.navy.mil> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a95ffda..b437252 100644
--- a/Makefile
+++ b/Makefile
@@ -1674,6 +1674,7 @@ GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
+ @echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
### Detect Tck/Tk interpreter path changes
ifndef NO_TCLTK