[llvm-rc] Support joined or separate spelling for /fo flag

CMake invokes rc using the joined spelling which appears to be supported by Microsoft's rc implementation, so we should support it as well. Differential Revision: https://reviews.llvm.org/D54191 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@346470 91177308-0d34-0410-b5e6-96231b3b80d8
poday · Nov 9, 2018 · b9dd8a3 · b9dd8a3
1 parent c36c93b
commit b9dd8a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/test/tools/llvm-rc/Inputs/empty.rc b/test/tools/llvm-rc/Inputs/empty.rc
diff --git a/test/tools/llvm-rc/flags.test b/test/tools/llvm-rc/flags.test
@@ -0,0 +1,4 @@
+; RUN: llvm-rc /dry-run /FO %t %p/Inputs/empty.rc 2>&1 | FileCheck %s --allow-empty --check-prefix=FO
+; RUN: llvm-rc /dry-run /FO%t %p/Inputs/empty.rc 2>&1 | FileCheck %s --allow-empty --check-prefix=FO
+
+; FO-NOT: Exactly one input file should be provided.
diff --git a/tools/llvm-rc/Opts.td b/tools/llvm-rc/Opts.td
@@ -4,7 +4,7 @@ include "llvm/Option/OptParser.td"
 // These options seem to be important for the tool
 // and should be implemented.
 
-def FILEOUT : Separate<[ "/", "-" ], "FO">,
+def FILEOUT : JoinedOrSeparate<[ "/", "-" ], "FO">,
               HelpText<"Change the output file location.">;
 
 def DEFINE : Separate<[ "/", "-" ], "D">,