r189909 - clang-cl: Use "clang cl.exe" when disambiguating the diagnostic prefix.

Reid Kleckner reid at kleckner.net
Tue Sep 3 20:10:36 PDT 2013


Author: rnk
Date: Tue Sep  3 22:10:36 2013
New Revision: 189909

URL: http://llvm.org/viewvc/llvm-project?rev=189909&view=rev
Log:
clang-cl: Use "clang cl.exe" when disambiguating the diagnostic prefix.

Modified:
    cfe/trunk/tools/driver/driver.cpp

Modified: cfe/trunk/tools/driver/driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/driver.cpp?rev=189909&r1=189908&r2=189909&view=diff
==============================================================================
--- cfe/trunk/tools/driver/driver.cpp (original)
+++ cfe/trunk/tools/driver/driver.cpp Tue Sep  3 22:10:36 2013
@@ -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<DiagnosticIDs> DiagID(new DiagnosticIDs());





More information about the cfe-commits mailing list