From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Fri, 17 Oct 2014 01:52:48 +0000 (+0000)
Subject: Remove incorrect usage of JoinedOrSeparate.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b147b20c4c0ded6413c7effb99323368398fd0a;p=clang

Remove incorrect usage of JoinedOrSeparate.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@220023 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index df0b7a4b8d..0d1a4e90ee 100644
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -654,7 +654,7 @@ def fmodule_maps : Flag <["-"], "fmodule-maps">, Group<f_Group>,
 def fmodule_name : JoinedOrSeparate<["-"], "fmodule-name=">, Group<f_Group>,
   Flags<[DriverOption,CC1Option]>, MetaVarName<"<name>">,
   HelpText<"Specify the name of the module to build">;
-def fmodule_map_file : JoinedOrSeparate<["-"], "fmodule-map-file=">,
+def fmodule_map_file : Joined<["-"], "fmodule-map-file=">,
   Group<f_Group>, Flags<[DriverOption,CC1Option]>, MetaVarName<"<file>">,
   HelpText<"Load this module map file">;
 def fmodules_ignore_macro : Joined<["-"], "fmodules-ignore-macro=">, Group<f_Group>, Flags<[CC1Option]>,
diff --git a/test/Driver/modules.m b/test/Driver/modules.m
index dafb934992..ba462b8300 100644
--- a/test/Driver/modules.m
+++ b/test/Driver/modules.m
@@ -36,5 +36,5 @@
 
 // RUN: %clang -fmodules -fmodule-map-file=foo.map -fmodule-map-file=bar.map -### %s 2>&1 | FileCheck -check-prefix=CHECK-MODULE-MAP-FILES %s
 // CHECK-MODULE-MAP-FILES: "-fmodules"
-// CHECK-MODULE-MAP-FILES: "-fmodule-map-file=" "foo.map"
-// CHECK-MODULE-MAP-FILES: "-fmodule-map-file=" "bar.map"
+// CHECK-MODULE-MAP-FILES: "-fmodule-map-file=foo.map"
+// CHECK-MODULE-MAP-FILES: "-fmodule-map-file=bar.map"