Commit a0ec07fdec9efb8364394ad12b4000a9072ed59f | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2022-08-08 14:26:10+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2022-08-08 14:26:10+02:00
log	a0ec07fdec9efb8364394ad12b4000a9072ed59f
tree	6343a17dd7d77ea21d431a4df9a7309154335a0f
parent	80c9d3f3b13a5e88a4103582f406a698fa8643d1

3 files changed, 19 insertions(+), 7 deletions(-)

src/clang_options_data.zig+10-3

...	...	@@ -33,7 +33,14 @@ flagpd1("H"),
33	33	.psl = false,
34	34	},
35	35	flagpd1("I-"),
36		flagpd1("M"),
	36	.{
	37	.name = "M",
	38	.syntax = .flag,
	39	.zig_equivalent = .dep_file_to_stdout,
	40	.pd1 = true,
	41	.pd2 = false,
	42	.psl = false,
	43	},
37	44	.{
38	45	.name = "MD",
39	46	.syntax = .flag,
...	...	@@ -53,7 +60,7 @@ flagpd1("M"),
53	60	.{
54	61	.name = "MM",
55	62	.syntax = .flag,
56		.zig_equivalent = .dep_file_mm,
	63	.zig_equivalent = .dep_file_to_stdout,
57	64	.pd1 = true,
58	65	.pd2 = false,
59	66	.psl = false,
...	...	@@ -1983,7 +1990,7 @@ flagpsl("MT"),
1983	1990	.{
1984	1991	.name = "user-dependencies",
1985	1992	.syntax = .flag,
1986		.zig_equivalent = .dep_file_mm,
	1993	.zig_equivalent = .dep_file_to_stdout,
1987	1994	.pd1 = false,
1988	1995	.pd2 = true,
1989	1996	.psl = false,

src/main.zig+3-2

...	...	@@ -1657,7 +1657,8 @@ fn buildOutputType(
1657	1657	disable_c_depfile = true;
1658	1658	try clang_argv.appendSlice(it.other_args);
1659	1659	},
1660		.dep_file_mm => { // -MM
	1660	.dep_file_to_stdout => { // -M, -MM
	1661	// "Like -MD, but also implies -E and writes to stdout by default"
1661	1662	// "Like -MMD, but also implies -E and writes to stdout by default"
1662	1663	c_out_mode = .preprocessor;
1663	1664	disable_c_depfile = true;
...	...	@@ -4652,7 +4653,7 @@ pub const ClangArgIterator = struct {
4652	4653	lib_dir,
4653	4654	mcpu,
4654	4655	dep_file,
4655		dep_file_mm,
	4656	dep_file_to_stdout,
4656	4657	framework_dir,
4657	4658	framework,
4658	4659	nostdlibinc,

tools/update_clang_options.zig+6-2

...	...	@@ -386,11 +386,15 @@ const known_options = [_]KnownOpt{
386	386	},
387	387	.{
388	388	.name = "MM",
389		.ident = "dep_file_mm",
	389	.ident = "dep_file_to_stdout",
	390	},
	391	.{
	392	.name = "M",
	393	.ident = "dep_file_to_stdout",
390	394	},
391	395	.{
392	396	.name = "user-dependencies",
393		.ident = "dep_file_mm",
	397	.ident = "dep_file_to_stdout",
394	398	},
395	399	.{
396	400	.name = "MMD",