[PATCH] D23503: [clang-cl] Check that we are in clang cl mode before enabling support for the CL environment variable.

[pierre gousseau via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL280702: [clang-cl] Check that we are in clang cl mode before enabling support for the… (authored by pgousseau).

Changed prior to commit:
  https://reviews.llvm.org/D23503?vs=68020&id=70376#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D23503

Files:
  cfe/trunk/test/Driver/cl-options.c
  cfe/trunk/tools/driver/driver.cpp

Index: cfe/trunk/tools/driver/driver.cpp
===================================================================
--- cfe/trunk/tools/driver/driver.cpp
+++ cfe/trunk/tools/driver/driver.cpp
@@ -393,7 +393,7 @@
 
   // 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()) {
Index: cfe/trunk/test/Driver/cl-options.c
===================================================================
--- cfe/trunk/test/Driver/cl-options.c
+++ cfe/trunk/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 \


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23503.70376.patch
Type: text/x-patch
Size: 1088 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160906/05a7a9ea/attachment.bin>