aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-03-04 18:23:11 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-03-04 18:23:11 -0700
commitbccef441963434b452a623abbb9315fd92c1e255 (patch)
tree4c0ea89b8fa895b3d34749ec089e45438d79466b /tools
parent0c06a1885fad9a9bb85342632a0b7c8a3a0733e9 (diff)
parent041212a41cfaf029dc3eb9740467b721c76f406c (diff)
downloadzig-bccef441963434b452a623abbb9315fd92c1e255.tar.gz
zig-bccef441963434b452a623abbb9315fd92c1e255.zip
Merge remote-tracking branch 'origin/master' into llvm12
Syncing with master branch because I want to re-run update_clang_options.zig in the llvm12 branch.
Diffstat (limited to 'tools')
-rw-r--r--tools/update_clang_options.zig18
1 files changed, 17 insertions, 1 deletions
diff --git a/tools/update_clang_options.zig b/tools/update_clang_options.zig
index 1cb134a731..f0dfe1639d 100644
--- a/tools/update_clang_options.zig
+++ b/tools/update_clang_options.zig
@@ -269,6 +269,10 @@ const known_options = [_]KnownOpt{
.ident = "dep_file",
},
.{
+ .name = "write-dependencies",
+ .ident = "dep_file",
+ },
+ .{
.name = "MV",
.ident = "dep_file",
},
@@ -285,18 +289,30 @@ const known_options = [_]KnownOpt{
.ident = "dep_file",
},
.{
+ .name = "print-missing-file-dependencies",
+ .ident = "dep_file",
+ },
+ .{
.name = "MJ",
.ident = "dep_file",
},
.{
.name = "MM",
- .ident = "dep_file",
+ .ident = "dep_file_mm",
+ },
+ .{
+ .name = "user-dependencies",
+ .ident = "dep_file_mm",
},
.{
.name = "MMD",
.ident = "dep_file",
},
.{
+ .name = "write-user-dependencies",
+ .ident = "dep_file",
+ },
+ .{
.name = "MP",
.ident = "dep_file",
},