aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Tooling/JSONCompilationDatabase.cpp
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2016-08-18 19:42:00 +0000
committerZachary Turner <zturner@google.com>2016-08-18 19:42:00 +0000
commit85d0f3140a0714818093089da991776f115dfa0e (patch)
treedd019c08d0b98de5f7d14bfb51e9636143f19214 /clang/lib/Tooling/JSONCompilationDatabase.cpp
parent6305f8a3517f5a702b691f81d669145263f82fa2 (diff)
downloadllvm-85d0f3140a0714818093089da991776f115dfa0e.zip
llvm-85d0f3140a0714818093089da991776f115dfa0e.tar.gz
llvm-85d0f3140a0714818093089da991776f115dfa0e.tar.bz2
Fix json compilation database syntax on non-Windows.
llvm-svn: 279122
Diffstat (limited to 'clang/lib/Tooling/JSONCompilationDatabase.cpp')
-rw-r--r--clang/lib/Tooling/JSONCompilationDatabase.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Tooling/JSONCompilationDatabase.cpp b/clang/lib/Tooling/JSONCompilationDatabase.cpp
index 07292da..152508f 100644
--- a/clang/lib/Tooling/JSONCompilationDatabase.cpp
+++ b/clang/lib/Tooling/JSONCompilationDatabase.cpp
@@ -117,16 +117,14 @@ class CommandLineArgumentParser {
std::vector<std::string> unescapeCommandLine(JSONCommandLineSyntax Syntax,
StringRef EscapedCommandLine) {
if (Syntax == JSONCommandLineSyntax::AutoDetect) {
+ Syntax = JSONCommandLineSyntax::Gnu;
llvm::Triple Triple(llvm::sys::getProcessTriple());
if (Triple.getOS() == llvm::Triple::OSType::Win32) {
// Assume Windows command line parsing on Win32 unless the triple
- // explicitly
- // tells us otherwise.
+ // explicitly tells us otherwise.
if (!Triple.hasEnvironment() ||
Triple.getEnvironment() == llvm::Triple::EnvironmentType::MSVC)
Syntax = JSONCommandLineSyntax::Windows;
- else
- Syntax = JSONCommandLineSyntax::Gnu;
}
}