Skip to content

Commit 89cccac

Browse files
author
Artem Gindinson
committed
Merge from 'sycl' to 'sycl-web' (#1)
CONFLICT (content): Merge conflict in clang/lib/Frontend/CompilerInvocation.cpp
2 parents 0b8fc2c + e8a8554 commit 89cccac

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

clang/include/clang/Driver/Options.td

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5028,7 +5028,8 @@ def header_include_file : Separate<["-"], "header-include-file">,
50285028
def show_includes : Flag<["--"], "show-includes">,
50295029
HelpText<"Print cl.exe style /showIncludes to stdout">;
50305030
def dependency_filter : Separate<["-"], "dependency-filter">,
5031-
HelpText<"Filter dependencies with prefix from the dependency output.">;
5031+
HelpText<"Filter dependencies with prefix from the dependency output.">,
5032+
MarshallingInfoString<DependencyOutputOpts<"DependencyFilter">>;
50325033

50335034
//===----------------------------------------------------------------------===//
50345035
// Diagnostic Options

0 commit comments

Comments
 (0)