From: Nico Weber <nicolasweber@gmx.de>
Date: Wed, 22 Aug 2018 23:53:39 +0000 (+0000)
Subject: win: Omit ".exe" from clang and clang-cl driver-level diagnostics.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f1a245294d2f56ba8b388913962b9ddd6862742;p=clang

win: Omit ".exe" from clang and clang-cl driver-level diagnostics.

Like https://reviews.llvm.org/D51133 but for clang.
https://reviews.llvm.org/D51134


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@340498 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index 0455ba029c..51143e3d8c 100644
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -260,9 +260,9 @@ static void FixupDiagPrefixExeName(TextDiagnosticPrinter *DiagClient,
                                    const std::string &Path) {
   // If the clang binary happens to be named cl.exe for compatibility reasons,
   // use clang-cl.exe as the prefix to avoid confusion between clang and MSVC.
-  StringRef ExeBasename(llvm::sys::path::filename(Path));
-  if (ExeBasename.equals_lower("cl.exe"))
-    ExeBasename = "clang-cl.exe";
+  StringRef ExeBasename(llvm::sys::path::stem(Path));
+  if (ExeBasename.equals_lower("cl"))
+    ExeBasename = "clang-cl";
   DiagClient->setPrefix(ExeBasename);
 }