summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-10-27 14:51:53 -0700
committerJunio C Hamano <gitster@pobox.com>2022-10-27 14:51:53 -0700
commit246eedf2bc38bf563fbb39e4ce9aaa1ff4a62573 (patch)
tree3717285422abc34fbe6babff10a417075c306ff1 /Makefile
parent702bb4baea0da4d283afd956be5a1e28915f5f9f (diff)
parentc858750b41ca9ea1c614dcc8d0c50f702d1e13b4 (diff)
downloadgit-246eedf2bc38bf563fbb39e4ce9aaa1ff4a62573.tar.gz
Merge branch 'js/cmake-updates'
Update to build procedure with VS using CMake/CTest. * js/cmake-updates: cmake: increase time-out for a long-running test cmake: avoid editing t/test-lib.sh add -p: avoid ambiguous signed/unsigned comparison cmake: copy the merge tools for testing cmake: make it easier to diagnose regressions in CTest runs
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 85f03c6aed..4659d89275 100644
--- a/Makefile
+++ b/Makefile
@@ -3042,6 +3042,7 @@ else
@echo RUNTIME_PREFIX=\'false\' >>$@+
endif
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
+ @if test -f GIT-BUILD-DIR; then rm GIT-BUILD-DIR; fi
### Detect Python interpreter path changes
ifndef NO_PYTHON