[PATCH] D79026: Add vendor macro to "lld"

[Steven Wan via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG44f7b4024982: Add vendor macro to "lld" (authored by stevewan).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D79026/new/

https://reviews.llvm.org/D79026

Files:
  lld/CMakeLists.txt
  lld/Common/Version.cpp


Index: lld/Common/Version.cpp
===================================================================
--- lld/Common/Version.cpp
+++ lld/Common/Version.cpp
@@ -19,9 +19,16 @@
 // Returns a version string, e.g.:
 // lld 9.0.0 (https://github.com/llvm/llvm-project.git 9efdd7ac5e914d3c9fa1ef)
 std::string lld::getLLDVersion() {
+#ifdef LLD_VENDOR
+#define LLD_VENDOR_DISPLAY LLD_VENDOR " "
+#else
+#define LLD_VENDOR_DISPLAY
+#endif
 #if defined(LLD_REPOSITORY) && defined(LLD_REVISION)
-  return "LLD " LLD_VERSION_STRING " (" LLD_REPOSITORY " " LLD_REVISION ")";
+  return LLD_VENDOR_DISPLAY "LLD " LLD_VERSION_STRING " (" LLD_REPOSITORY
+                            " " LLD_REVISION ")";
 #else
-  return "LLD " LLD_VERSION_STRING;
+  return LLD_VENDOR_DISPLAY "LLD " LLD_VERSION_STRING;
 #endif
+#undef LLD_VENDOR_DISPLAY
 }
Index: lld/CMakeLists.txt
===================================================================
--- lld/CMakeLists.txt
+++ lld/CMakeLists.txt
@@ -142,6 +142,13 @@
 set(LLD_INCLUDE_DIR ${LLD_SOURCE_DIR}/include )
 set(LLD_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
+set(LLD_VENDOR ${PACKAGE_VENDOR} CACHE STRING
+  "Vendor-specific text for showing with version information.")
+
+if(LLD_VENDOR)
+  add_definitions(-DLLD_VENDOR="${LLD_VENDOR}")
+endif()
+
 # Compute the LLD version from the LLVM version.
 string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" LLD_VERSION
   ${PACKAGE_VERSION})


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D79026.263297.patch
Type: text/x-patch
Size: 1410 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200511/61cecf45/attachment.bin>