Calculate git-derived versions correctly when out-of-tree.
This commit is contained in:
parent
d8d9adfbd6
commit
f052d9b4c2
|
@ -407,8 +407,8 @@ endif
|
||||||
|
|
||||||
boot/version.ml: $(MKFILES)
|
boot/version.ml: $(MKFILES)
|
||||||
@$(call E, git: $@)
|
@$(call E, git: $@)
|
||||||
$(Q)git log -1 \
|
$(Q)(cd $(S) && git log -1 \
|
||||||
--pretty=format:'let version = "prerelease (%h %ci)";;' >$@ || exit 1
|
--pretty=format:'let version = "prerelease (%h %ci)";;') >$@ || exit 1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -501,8 +501,8 @@ rustllvm/%.o: rustllvm/%.cpp $(MKFILES)
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
doc/version.texi: $(MKFILES) rust.texi
|
doc/version.texi: $(MKFILES) rust.texi
|
||||||
git log -1 \
|
(cd $(S) && git log -1 \
|
||||||
--pretty=format:'@macro gitversion%n%h %ci%n@end macro%n' >$@
|
--pretty=format:'@macro gitversion%n%h %ci%n@end macro%n') >$@
|
||||||
|
|
||||||
doc/%.pdf: %.texi doc/version.texi
|
doc/%.pdf: %.texi doc/version.texi
|
||||||
texi2pdf -I doc -o $@ --clean $<
|
texi2pdf -I doc -o $@ --clean $<
|
||||||
|
|
Loading…
Reference in New Issue