---

yaml
---
r: 3052
b: refs/heads/master
c: 0a8f9a3
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb811a903fb1856203a8e2233efe50cd36d2e5b4
+refs/heads/master: 0a8f9a394bd3aa509ad313334daa78686bc4d817

trunk/Makefile.in

@@ -49,10 +49,12 @@ CFG_RUSTCLIB :=$(call CFG_LIB_NAME,rustc)
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
 CFG_VERSION := prerelease
+ifneq ($(wildcard $(CFG_GIT)),)
 ifneq ($(wildcard $(CFG_GIT_DIR)),)
     CFG_VERSION += $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
                      --pretty=format:'(%h %ci)')
 endif
+endif
 
 ifdef CFG_DISABLE_VALGRIND
   $(info cfg: disabling valgrind (CFG_DISABLE_VALGRIND))

trunk/configure

@@ -193,11 +193,11 @@ putvar CFG_CPUTYPE
 putvar CFG_CONFIGURE_ARGS
 
 step_msg "looking for build programs"
-probe_need CFG_GIT          git
 probe_need CFG_PERL         perl
 probe_need CFG_PYTHON       python
 probe_need CFG_CURL         curl
 
+probe CFG_GIT          git
 probe CFG_CLANG            clang++
 probe CFG_GCC              gcc
 probe CFG_LLVM_CONFIG      llvm-config

trunk/mk/docs.mk

@@ -3,8 +3,9 @@
 ######################################################################
 
 doc/version.texi: $(MKFILES) rust.texi
-	(cd $(S) && git log -1 \
-      --pretty=format:'@macro gitversion%n%h %ci%n@end macro%n') >$@
+	echo "@macro gitversion" >$@
+	echo $(CFG_VERSION) >>$@
+	echo "@end macro" >>$@
 
 doc/%.pdf: %.texi doc/version.texi
 	texi2pdf --batch -I doc -o $@ --clean $<