From 8cb1bf84540d73a609105fd04e851a2d3d37389a Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 4 Sep 2013 03:10:36 +0000 Subject: [PATCH] clang-cl: Use "clang cl.exe" when disambiguating the diagnostic prefix. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189909 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/driver/driver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index 15936bf219..3c66f8a2f0 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -350,8 +350,8 @@ int main(int argc_, const char **argv_) { // 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.trim().equals_lower("cl.exe")) - ExeBasename = "clang-cl.exe"; + if (ExeBasename.equals_lower("cl.exe")) + ExeBasename = "clang cl.exe"; DiagClient->setPrefix(ExeBasename); IntrusiveRefCntPtr DiagID(new DiagnosticIDs()); -- 2.40.0