From 9be96537af07b1f03a55550b932df6f5397c9e6b Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Wed, 30 Nov 2016 15:48:46 +0000 Subject: Remove support for reporting the approximate git tag. This was confusing because it would emit something like `v1.0.0-290-g08d4716` because the 1.1.0 and 1.2.0 releases didn't have a tag on the master branch so `git describe --tags` would just find the `v1.0.0` tag and report based on that tag. --- lib/Support/Makefile | 10 ---------- lib/Support/PrintVersion.cpp | 3 --- 2 files changed, 13 deletions(-) (limited to 'lib/Support') diff --git a/lib/Support/Makefile b/lib/Support/Makefile index 2b1b104c..ff28b06e 100644 --- a/lib/Support/Makefile +++ b/lib/Support/Makefile @@ -26,12 +26,6 @@ include $(LEVEL)/Makefile.common GIT_PRESENT:=$(shell [ -d "$(PROJ_SRC_ROOT)/.git" ] && echo 1 || echo 0) -ifeq ($(GIT_PRESENT),1) -GIT_TAGS:=$(shell cd $(PROJ_SRC_ROOT); git describe --tags 2> /dev/null 1>&2 && echo 1 || echo 0) -else -GIT_TAGS:=0 -endif - .PHONY: $(CompileTimeInfoFile) $(CompileTimeInfoFile): $(Verb) echo "Regenerating $(CompileTimeInfoFile)" @@ -40,7 +34,3 @@ ifeq ($(GIT_PRESENT),1) $(Verb) echo '#define KLEE_BUILD_REVISION "'$(shell cd $(PROJ_SRC_ROOT); git rev-parse HEAD)'"' >> \ $(CompileTimeInfoFile) endif -ifeq ($(GIT_TAGS),1) - $(Verb) echo '#define KLEE_BUILD_TAG "'$(shell cd $(PROJ_SRC_ROOT); git describe --tags)'"' >> \ - $(CompileTimeInfoFile) -endif diff --git a/lib/Support/PrintVersion.cpp b/lib/Support/PrintVersion.cpp index dfea5007..d39249df 100644 --- a/lib/Support/PrintVersion.cpp +++ b/lib/Support/PrintVersion.cpp @@ -26,9 +26,6 @@ void klee::printVersion() llvm::outs() << KLEE_BUILD_REVISION "\n"; #else llvm::outs() << "unknown\n"; -#endif -#ifdef KLEE_BUILD_TAG - llvm::outs() << " Build tag: " << KLEE_BUILD_TAG "\n"; #endif // Show LLVM version information llvm::outs() << "\n"; -- cgit 1.4.1