From 19dd934f97ab1a5fffc068eb0ade5afdafb46ea7 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Wed, 14 Sep 2016 22:31:24 +0000
Subject: [PATCH] [clang-cl] Accept the joined equals version of -resource-dir=

lib/Tooling injects this argument without regard for what driver syntax
is in use.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@281550 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/clang/Driver/Options.td | 2 +-
 test/Driver/cl-options.c        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index 9fa0054a735..ebb54b7f714 100644
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -1860,7 +1860,7 @@ def rdynamic : Flag<["-"], "rdynamic">;
 def resource_dir : Separate<["-"], "resource-dir">,
   Flags<[DriverOption, CC1Option, CoreOption, HelpHidden]>,
   HelpText<"The directory which holds the compiler resource files">;
-def resource_dir_EQ : Joined<["-"], "resource-dir=">, Flags<[DriverOption]>,
+def resource_dir_EQ : Joined<["-"], "resource-dir=">, Flags<[DriverOption, CoreOption]>,
   Alias<resource_dir>;
 def rpath : Separate<["-"], "rpath">, Flags<[LinkerInput]>;
 def rtlib_EQ : Joined<["-", "--"], "rtlib=">,
diff --git a/test/Driver/cl-options.c b/test/Driver/cl-options.c
index d4e9a5ef02e..4e99ff8467c 100644
--- a/test/Driver/cl-options.c
+++ b/test/Driver/cl-options.c
@@ -515,7 +515,8 @@
 // RUN:     -fms-extensions \
 // RUN:     -fno-ms-extensions \
 // RUN:     -mllvm -disable-llvm-optzns \
-// RUN:     -resource-dir \
+// RUN:     -resource-dir asdf \
+// RUN:     -resource-dir=asdf \
 // RUN:     -Wunused-variable \
 // RUN:     -fmacro-backtrace-limit=0 \
 // RUN:     -fstandalone-debug \
-- 
GitLab