summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-16 07:11:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-16 07:11:53 (GMT)
commita80dff25152f43e8a9a688943cb5f67d2ad76fc4 (patch)
tree3760f6498e4d80c9fa6d4af7f7aaf94798fb2408 /Makefile
parentdd0a21ede0998ec790c37865c7dc119814ac7745 (diff)
downloadgit-a80dff25152f43e8a9a688943cb5f67d2ad76fc4.zip
git-a80dff25152f43e8a9a688943cb5f67d2ad76fc4.tar.gz
git-a80dff25152f43e8a9a688943cb5f67d2ad76fc4.tar.bz2
Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
Otherwise we would fail to rebuild correctly when this option was changed between $(MAKE) invocations, and more importantly, $(MAKE) test would not pass it down and t/test-lib.sh would not set the LIBPCRE prerequisite. 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 fea55c0..c449f5d 100644
--- a/Makefile
+++ b/Makefile
@@ -2109,6 +2109,7 @@ GIT-BUILD-OPTIONS: FORCE
@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
+ @echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
ifdef GIT_TEST_CMP