hlopko created this revision. hlopko added a reviewer: gribozavr2. Herald added subscribers: llvm-commits, lldb-commits, cfe-commits, mgorny. Herald added a reviewer: MaskRay. Herald added projects: clang, LLDB, LLVM.
This preprocessor define was meant to be used to conditionally include headers with VCS information (for example VCSRevision.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. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D84623 Files: clang/lib/Basic/CMakeLists.txt clang/lib/Basic/Version.cpp lld/Common/CMakeLists.txt lld/Common/Version.cpp lldb/source/CMakeLists.txt lldb/source/lldb.cpp llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn llvm/utils/gn/secondary/lld/Common/BUILD.gn
Index: llvm/utils/gn/secondary/lld/Common/BUILD.gn =================================================================== --- llvm/utils/gn/secondary/lld/Common/BUILD.gn +++ llvm/utils/gn/secondary/lld/Common/BUILD.gn @@ -42,5 +42,4 @@ "Timer.cpp", "Version.cpp", ] - defines = [ "HAVE_VCS_VERSION_INC" ] # For Version.cpp } Index: llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn =================================================================== --- llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn +++ llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn @@ -102,5 +102,4 @@ "XRayInstr.cpp", "XRayLists.cpp", ] - defines = [ "HAVE_VCS_VERSION_INC" ] # For Version.cpp } Index: lldb/source/lldb.cpp =================================================================== --- lldb/source/lldb.cpp +++ lldb/source/lldb.cpp @@ -13,9 +13,7 @@ #include "clang/Basic/Version.h" -#ifdef HAVE_VCS_VERSION_INC #include "VCSVersion.inc" -#endif static const char *GetLLDBRevision() { #ifdef LLDB_REVISION Index: lldb/source/CMakeLists.txt =================================================================== --- lldb/source/CMakeLists.txt +++ lldb/source/CMakeLists.txt @@ -34,9 +34,6 @@ PROPERTIES GENERATED TRUE HEADER_FILE_ONLY TRUE) -set_property(SOURCE lldb.cpp APPEND PROPERTY - COMPILE_DEFINITIONS "HAVE_VCS_VERSION_INC") - list(APPEND lldbBase_SOURCES ${version_inc}) if(LLDB_VERSION_STRING) Index: lld/Common/Version.cpp =================================================================== --- lld/Common/Version.cpp +++ lld/Common/Version.cpp @@ -12,9 +12,7 @@ #include "lld/Common/Version.h" -#ifdef HAVE_VCS_VERSION_INC #include "VCSVersion.inc" -#endif // Returns a version string, e.g.: // lld 9.0.0 (https://github.com/llvm/llvm-project.git 9efdd7ac5e914d3c9fa1ef) Index: lld/Common/CMakeLists.txt =================================================================== --- lld/Common/CMakeLists.txt +++ lld/Common/CMakeLists.txt @@ -20,9 +20,6 @@ PROPERTIES GENERATED TRUE HEADER_FILE_ONLY TRUE) -set_property(SOURCE Version.cpp APPEND PROPERTY - COMPILE_DEFINITIONS "HAVE_VCS_VERSION_INC") - add_lld_library(lldCommon Args.cpp DWARF.cpp Index: clang/lib/Basic/Version.cpp =================================================================== --- clang/lib/Basic/Version.cpp +++ clang/lib/Basic/Version.cpp @@ -17,9 +17,7 @@ #include <cstdlib> #include <cstring> -#ifdef HAVE_VCS_VERSION_INC #include "VCSVersion.inc" -#endif namespace clang { Index: clang/lib/Basic/CMakeLists.txt =================================================================== --- clang/lib/Basic/CMakeLists.txt +++ clang/lib/Basic/CMakeLists.txt @@ -33,9 +33,6 @@ PROPERTIES GENERATED TRUE HEADER_FILE_ONLY TRUE) -set_property(SOURCE Version.cpp APPEND PROPERTY - COMPILE_DEFINITIONS "HAVE_VCS_VERSION_INC") - add_clang_library(clangBasic Attributes.cpp Builtins.cpp
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits