Skip to content

Revert "[llvm] Include LLVM_REPOSITORY and LLVM_REVISION in tool version" #85879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

JDevlieghere
Copy link
Member

Reverts #84990 because this causes a full rebuild after the commit hash changes.

@JDevlieghere JDevlieghere merged commit 595280a into main Mar 20, 2024
@JDevlieghere JDevlieghere deleted the revert-84990-llvm-repository-revision branch March 20, 2024 00:16
@llvmbot
Copy link
Member

llvmbot commented Mar 20, 2024

@llvm/pr-subscribers-llvm-support

Author: Jonas Devlieghere (JDevlieghere)

Changes

Reverts llvm/llvm-project#84990 because this causes a full rebuild after the commit hash changes.


Full diff: https://github.com/llvm/llvm-project/pull/85879.diff

2 Files Affected:

  • (modified) llvm/lib/Support/CMakeLists.txt (-3)
  • (modified) llvm/lib/Support/CommandLine.cpp (+1-10)
diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index da2a4b4cdec568..e18beddf7bc5b7 100644
--- a/llvm/lib/Support/CMakeLists.txt
+++ b/llvm/lib/Support/CMakeLists.txt
@@ -288,9 +288,6 @@ add_llvm_component_library(LLVMSupport
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Support
   ${Backtrace_INCLUDE_DIRS}
 
-  DEPENDS
-  llvm_vcsrevision_h
-
   LINK_LIBS
   ${system_libs} ${imported_libs} ${delayload_flags}
 
diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp
index 42dbc4de200303..c076ae8b843179 100644
--- a/llvm/lib/Support/CommandLine.cpp
+++ b/llvm/lib/Support/CommandLine.cpp
@@ -39,7 +39,6 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/StringSaver.h"
-#include "llvm/Support/VCSRevision.h"
 #include "llvm/Support/VirtualFileSystem.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cstdlib>
@@ -2539,15 +2538,7 @@ class VersionPrinter {
 #else
     OS << "LLVM (http://llvm.org/):\n  ";
 #endif
-    OS << PACKAGE_NAME << " version " << PACKAGE_VERSION;
-#ifdef LLVM_REPOSITORY
-    OS << " (" << LLVM_REPOSITORY;
-#ifdef LLVM_REVISION
-    OS << ' ' << LLVM_REVISION;
-#endif
-    OS << ')';
-#endif
-    OS << "\n  ";
+    OS << PACKAGE_NAME << " version " << PACKAGE_VERSION << "\n  ";
 #if LLVM_IS_DEBUG_BUILD
     OS << "DEBUG build";
 #else

chencha3 pushed a commit to chencha3/llvm-project that referenced this pull request Mar 23, 2024
…ion" (llvm#85879)

Reverts llvm#84990 because this causes a full rebuild after
the commit hash changes.
qiaojbao pushed a commit to GPUOpen-Drivers/llvm-project that referenced this pull request May 15, 2024
…119d3fd45

Local branch amd-gfx b70119d Merged main:888e2849036c7a216dd6208a2fe5a59393d4767a into amd-gfx:72c6d960b5b2
Remote branch main 595280a Revert "[llvm] Include LLVM_REPOSITORY and LLVM_REVISION in tool version" (llvm#85879)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants