proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-11-02 12:31:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

patches/remove-trailing-space-version.diff: cherry-pick an upstream patch to address https://bugs.llvm.org/show_bug.cgi?id=38998#c15 trailing whitespace of clang full version causing a display issue when building the linux kernel with clang

Browse Source
This commit is contained in:
Sylvestre Ledru 2020-07-08 14:14:01 +02:00
parent 0d085612b3
commit ae2a82d389
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -7,6 +7,10 @@ llvm-toolchain-10 (1:10.0.1~+rc4-1) unstable; urgency=medium
And make sure that the test is only executed when installed correctly
Otherwise, fails with
"./foo.bc: cannot execute binary file: Exec format error"
* patches/remove-trailing-space-version.diff: cherry-pick an upstream patch
to address https://bugs.llvm.org/show_bug.cgi?id=38998#c15
trailing whitespace of clang full version causing a display issue
when building the linux kernel with clang
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 08 Jul 2020 10:49:26 +0200

47
debian/patches/remove-trailing-space-version.diff vendored Normal file
View File

@ -0,0 +1,47 @@
commit bbea4d5e6b82a683dccaa8f4916e2a44f5dd3490
Author: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed Jul 8 13:33:34 2020 +0200
clang: Don't show a trailing space with --version when not built from the repo
Reported here:
https://bugs.llvm.org/show_bug.cgi?id=38998#c15
Reviewers: hans
Differential Revision: https://reviews.llvm.org/D83386
diff --git a/clang/lib/Basic/Version.cpp b/clang/lib/Basic/Version.cpp
index c4b7d34ed16..286107cab9d 100644
--- a/clang/lib/Basic/Version.cpp
+++ b/clang/lib/Basic/Version.cpp
@@ -97,8 +97,12 @@ std::string getClangToolFullVersion(StringRef ToolName) {
#ifdef CLANG_VENDOR
OS << CLANG_VENDOR;
#endif
- OS << ToolName << " version " CLANG_VERSION_STRING " "
- << getClangFullRepositoryVersion();
+ OS << ToolName << " version " CLANG_VERSION_STRING;
+
+ std::string repo = getClangFullRepositoryVersion();
+ if (!repo.empty()) {
+ OS << " " << repo;
+ }
return OS.str();
}
@@ -111,7 +115,13 @@ std::string getClangFullCPPVersion() {
#ifdef CLANG_VENDOR
OS << CLANG_VENDOR;
#endif
- OS << "Clang " CLANG_VERSION_STRING " " << getClangFullRepositoryVersion();
+ OS << "Clang " CLANG_VERSION_STRING;
+
+ std::string repo = getClangFullRepositoryVersion();
+ if (!repo.empty()) {
+ OS << " " << repo;
+ }
+
return OS.str();
}

1
debian/patches/series vendored
View File

@ -145,3 +145,4 @@ no-cgi.patch
ubuntu-groovy.diff
clang_vendor_pass_stage2.diff
remove-trailing-space-version.diff