diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2016-12-01 21:54:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 21:54:00 +0000 |
| commit | 74c6155ff3895e790d58689903b87308dfc05853 (patch) | |
| tree | f5f6349e36b59acedd5278048f7a788a8da58f8b | |
| parent | a92a1c02de4d13451e5b94569449ad4a0e996692 (diff) | |
| parent | 9be96537af07b1f03a55550b932df6f5397c9e6b (diff) | |
| download | klee-74c6155ff3895e790d58689903b87308dfc05853.tar.gz | |
Merge pull request #523 from delcypher/remove_klee_tag_output
Remove support for reporting the approximate git tag.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | include/klee/Config/CompileTimeInfo.h.cmin | 1 | ||||
| -rw-r--r-- | lib/Support/Makefile | 10 | ||||
| -rw-r--r-- | lib/Support/PrintVersion.cpp | 3 |
4 files changed, 0 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d19296f..68e83733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -624,11 +624,8 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git") include(${CMAKE_SOURCE_DIR}/cmake/GetGitRevisionDescription.cmake) get_git_head_revision(_NOT_USED_KLEE_GIT_REFSPEC KLEE_GIT_SHA1HASH) message(STATUS "KLEE_GIT_SHA1HASH: ${KLEE_GIT_SHA1HASH}") - git_describe(KLEE_GIT_TAG "--tags") - message(STATUS "KLEE_GIT_TAG: ${KLEE_GIT_TAG}") else() set(KLEE_GIT_SHA1HASH "unknown") - set(KLEE_GIT_TAG "unknown") endif() set(AUTO_GEN_MSG "AUTOMATICALLY GENERATED. DO NOT EDIT!") configure_file(${CMAKE_SOURCE_DIR}/include/klee/Config/CompileTimeInfo.h.cmin diff --git a/include/klee/Config/CompileTimeInfo.h.cmin b/include/klee/Config/CompileTimeInfo.h.cmin index 72dbc7b1..6f13537a 100644 --- a/include/klee/Config/CompileTimeInfo.h.cmin +++ b/include/klee/Config/CompileTimeInfo.h.cmin @@ -13,6 +13,5 @@ #define KLEE_BUILD_MODE "@CMAKE_BUILD_TYPE@ (Asserts: @ENABLE_KLEE_ASSERTS@)" #define KLEE_BUILD_REVISION "@KLEE_GIT_SHA1HASH@" -#define KLEE_BUILD_TAG "@KLEE_GIT_TAG@" #endif 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 @@ -27,9 +27,6 @@ void klee::printVersion() #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"; llvm::cl::PrintVersionMessage(); |