diff options
| -rw-r--r-- | clang/test/Driver/cl-options.c | 2 | ||||
| -rw-r--r-- | clang/tools/driver/driver.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index e5e540207cf..9b06963eb73 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -493,6 +493,8 @@ // RUN: env CL="/Gy" _CL_="/Gy- -- %s" %clang_cl -### 2>&1 | FileCheck -check-prefix=ENV-_CL_ %s // ENV-_CL_-NOT: "-ffunction-sections" +// RUN: env CL="%s" _CL_="%s" not %clang --rsp-quoting=windows -c + // Accept "core" clang options. // (/Zs is for syntax-only, -Werror makes it fail hard on unknown options) // RUN: %clang_cl \ diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp index 9208ecdba00..61613028625 100644 --- a/clang/tools/driver/driver.cpp +++ b/clang/tools/driver/driver.cpp @@ -393,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()) { |
