diff options
| author | Reid Kleckner <reid@kleckner.net> | 2013-09-04 01:37:22 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2013-09-04 01:37:22 +0000 |
| commit | 7b7fd838f24f67920d5287962765b772592e905e (patch) | |
| tree | 00fe90ae9fdfd2c499664452e996eb1b1c4a6bac /tools/driver/driver.cpp | |
| parent | c47063e1e647c3749b1851e42c78ac52938d2fbb (diff) | |
| download | clang-7b7fd838f24f67920d5287962765b772592e905e.tar.gz clang-7b7fd838f24f67920d5287962765b772592e905e.tar.bz2 clang-7b7fd838f24f67920d5287962765b772592e905e.tar.xz | |
clang-cl: Avoid confusing diagnostics when clang-cl is called just cl.exe
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189901 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/driver/driver.cpp')
| -rw-r--r-- | tools/driver/driver.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index 88863ab066..15936bf219 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -346,7 +346,14 @@ int main(int argc_, const char **argv_) { // DiagnosticOptions instance. TextDiagnosticPrinter *DiagClient = new TextDiagnosticPrinter(llvm::errs(), &*DiagOpts); - DiagClient->setPrefix(llvm::sys::path::filename(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.trim().equals_lower("cl.exe")) + ExeBasename = "clang-cl.exe"; + DiagClient->setPrefix(ExeBasename); + IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs()); DiagnosticsEngine Diags(DiagID, &*DiagOpts, DiagClient); |