diff options
Diffstat (limited to 'tools/driver/driver.cpp')
| -rw-r--r-- | tools/driver/driver.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp index 4d69aaffba23e..61613028625b3 100644 --- a/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -12,7 +12,6 @@ // //===----------------------------------------------------------------------===// -#include "clang/Basic/CharInfo.h" #include "clang/Basic/DiagnosticOptions.h" #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" @@ -25,7 +24,6 @@ #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/Frontend/Utils.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Config/llvm-config.h" @@ -37,7 +35,6 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/Host.h" #include "llvm/Support/ManagedStatic.h" -#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Process.h" @@ -49,6 +46,7 @@ #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" #include <memory> +#include <set> #include <system_error> using namespace clang; using namespace clang::driver; @@ -395,7 +393,7 @@ int main(int argc_, const char **argv_) { // Handle CL and _CL_ which permits additional command line options to be // prepended or appended. - if (Tokenizer == &llvm::cl::TokenizeWindowsCommandLine) { + if (ClangCLMode) { // Arguments in "CL" are prepended. llvm::Optional<std::string> OptCL = llvm::sys::Process::GetEnv("CL"); if (OptCL.hasValue()) { |