Skip to content

Commit 9bb9b73

Browse files
hlopkoMaskRay
authored andcommitted
Remove HAVE_VCS_VERSION_INC, not needed
This preprocessor define was meant to be used to conditionally include VCSVersion.inc. However, the define was always set, and it was the content of the header that was conditionally generated. Therefore HAVE_VCS_VERSION_INC should be cleaned up. Reviewed By: gribozavr2, MaskRay Differential Revision: https://reviews.llvm.org/D84623
1 parent 91bf172 commit 9bb9b73

File tree

8 files changed

+0
-17
lines changed

8 files changed

+0
-17
lines changed

clang/lib/Basic/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ set_source_files_properties("${version_inc}"
3333
PROPERTIES GENERATED TRUE
3434
HEADER_FILE_ONLY TRUE)
3535

36-
set_property(SOURCE Version.cpp APPEND PROPERTY
37-
COMPILE_DEFINITIONS "HAVE_VCS_VERSION_INC")
38-
3936
add_clang_library(clangBasic
4037
Attributes.cpp
4138
Builtins.cpp

clang/lib/Basic/Version.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
#include <cstdlib>
1818
#include <cstring>
1919

20-
#ifdef HAVE_VCS_VERSION_INC
2120
#include "VCSVersion.inc"
22-
#endif
2321

2422
namespace clang {
2523

lld/Common/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ set_source_files_properties("${version_inc}"
2626
PROPERTIES GENERATED TRUE
2727
HEADER_FILE_ONLY TRUE)
2828

29-
set_property(SOURCE Version.cpp APPEND PROPERTY
30-
COMPILE_DEFINITIONS "HAVE_VCS_VERSION_INC")
31-
3229
add_lld_library(lldCommon
3330
Args.cpp
3431
DWARF.cpp

lld/Common/Version.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212

1313
#include "lld/Common/Version.h"
1414

15-
#ifdef HAVE_VCS_VERSION_INC
1615
#include "VCSVersion.inc"
17-
#endif
1816

1917
// Returns a version string, e.g.:
2018
// lld 9.0.0 (https://github.com/llvm/llvm-project.git 9efdd7ac5e914d3c9fa1ef)

lldb/source/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ set_source_files_properties("${version_inc}"
2626
PROPERTIES GENERATED TRUE
2727
HEADER_FILE_ONLY TRUE)
2828

29-
set_property(SOURCE lldb.cpp APPEND PROPERTY
30-
COMPILE_DEFINITIONS "HAVE_VCS_VERSION_INC")
31-
3229
list(APPEND lldbBase_SOURCES ${version_inc})
3330

3431
if(LLDB_VERSION_STRING)

lldb/source/lldb.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ using namespace lldb_private;
1313

1414
#include "clang/Basic/Version.h"
1515

16-
#ifdef HAVE_VCS_VERSION_INC
1716
#include "VCSVersion.inc"
18-
#endif
1917

2018
static const char *GetLLDBRevision() {
2119
#ifdef LLDB_REVISION

llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,4 @@ static_library("Basic") {
103103
"XRayInstr.cpp",
104104
"XRayLists.cpp",
105105
]
106-
defines = [ "HAVE_VCS_VERSION_INC" ] # For Version.cpp
107106
}

llvm/utils/gn/secondary/lld/Common/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ static_library("Common") {
4242
"Timer.cpp",
4343
"Version.cpp",
4444
]
45-
defines = [ "HAVE_VCS_VERSION_INC" ] # For Version.cpp
4645
}

0 commit comments

Comments
 (0)