authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-12-19 15:59:49-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-01 17:51:21-07:00
log056f04c1ff71fe6e4cf18d7b46bc821b12d874f1
treef28da1a635f339fd598c8c7549d3bc81f1940d8c
parentfad35835aac7d6ac1a3654eba631febbf8d4e82b

CLI: rename clang_argv to cc_argv

The args apply to Aro as well.

1 files changed, 22 insertions(+), 22 deletions(-)

src/main.zig+22-22
......@@ -911,7 +911,7 @@ fn buildOutputType(
911911 // These get appended to by CLI flags and then slurped when a `--mod` flag
912912 // is encountered.
913913 var cssan: ClangSearchSanitizer = .{};
914 var clang_argv: std.ArrayListUnmanaged([]const u8) = .{};
914 var cc_argv: std.ArrayListUnmanaged([]const u8) = .{};
915915 var deps: std.ArrayListUnmanaged(CliModule.Dep) = .{};
916916
917917 // Contains every module specified via --mod. The dependencies are added
......@@ -1067,7 +1067,7 @@ fn buildOutputType(
10671067 },
10681068 .root_src_path = fs.path.basename(root_src),
10691069 },
1070 .cc_argv = try clang_argv.toOwnedSlice(arena),
1070 .cc_argv = try cc_argv.toOwnedSlice(arena),
10711071 .inherited = mod_opts,
10721072 .target_arch_os_abi = target_arch_os_abi,
10731073 .target_mcpu = target_mcpu,
......@@ -1226,22 +1226,22 @@ fn buildOutputType(
12261226 .search_strategy = lib_search_strategy,
12271227 });
12281228 } else if (mem.eql(u8, arg, "-D")) {
1229 try clang_argv.appendSlice(arena, &.{ arg, args_iter.nextOrFatal() });
1229 try cc_argv.appendSlice(arena, &.{ arg, args_iter.nextOrFatal() });
12301230 } else if (mem.eql(u8, arg, "-I")) {
1231 try cssan.addIncludePath(arena, &clang_argv, .I, arg, args_iter.nextOrFatal(), false);
1231 try cssan.addIncludePath(arena, &cc_argv, .I, arg, args_iter.nextOrFatal(), false);
12321232 } else if (mem.eql(u8, arg, "-isystem")) {
1233 try cssan.addIncludePath(arena, &clang_argv, .isystem, arg, args_iter.nextOrFatal(), false);
1233 try cssan.addIncludePath(arena, &cc_argv, .isystem, arg, args_iter.nextOrFatal(), false);
12341234 } else if (mem.eql(u8, arg, "-iwithsysroot")) {
1235 try cssan.addIncludePath(arena, &clang_argv, .iwithsysroot, arg, args_iter.nextOrFatal(), false);
1235 try cssan.addIncludePath(arena, &cc_argv, .iwithsysroot, arg, args_iter.nextOrFatal(), false);
12361236 } else if (mem.eql(u8, arg, "-idirafter")) {
1237 try cssan.addIncludePath(arena, &clang_argv, .idirafter, arg, args_iter.nextOrFatal(), false);
1237 try cssan.addIncludePath(arena, &cc_argv, .idirafter, arg, args_iter.nextOrFatal(), false);
12381238 } else if (mem.eql(u8, arg, "-iframework")) {
12391239 const path = args_iter.nextOrFatal();
1240 try cssan.addIncludePath(arena, &clang_argv, .iframework, arg, path, false);
1240 try cssan.addIncludePath(arena, &cc_argv, .iframework, arg, path, false);
12411241 try create_module.framework_dirs.append(arena, path); // Forward to the backend as -F
12421242 } else if (mem.eql(u8, arg, "-iframeworkwithsysroot")) {
12431243 const path = args_iter.nextOrFatal();
1244 try cssan.addIncludePath(arena, &clang_argv, .iframeworkwithsysroot, arg, path, false);
1244 try cssan.addIncludePath(arena, &cc_argv, .iframeworkwithsysroot, arg, path, false);
12451245 try create_module.framework_dirs.append(arena, path); // Forward to the backend as -F
12461246 } else if (mem.eql(u8, arg, "--version")) {
12471247 const next_arg = args_iter.nextOrFatal();
......@@ -1268,7 +1268,7 @@ fn buildOutputType(
12681268 } else if (mem.eql(u8, arg, "--sysroot")) {
12691269 const next_arg = args_iter.nextOrFatal();
12701270 create_module.sysroot = next_arg;
1271 try clang_argv.appendSlice(arena, &.{ "-isysroot", next_arg });
1271 try cc_argv.appendSlice(arena, &.{ "-isysroot", next_arg });
12721272 } else if (mem.eql(u8, arg, "--libc")) {
12731273 create_module.libc_paths_file = args_iter.nextOrFatal();
12741274 } else if (mem.eql(u8, arg, "--test-filter")) {
......@@ -1650,9 +1650,9 @@ fn buildOutputType(
16501650 .search_strategy = lib_search_strategy,
16511651 });
16521652 } else if (mem.startsWith(u8, arg, "-D")) {
1653 try clang_argv.append(arena, arg);
1653 try cc_argv.append(arena, arg);
16541654 } else if (mem.startsWith(u8, arg, "-I")) {
1655 try cssan.addIncludePath(arena, &clang_argv, .I, arg, arg[2..], true);
1655 try cssan.addIncludePath(arena, &cc_argv, .I, arg, arg[2..], true);
16561656 } else if (mem.eql(u8, arg, "-x")) {
16571657 const lang = args_iter.nextOrFatal();
16581658 if (mem.eql(u8, lang, "none")) {
......@@ -1776,7 +1776,7 @@ fn buildOutputType(
17761776 }
17771777 },
17781778 .other => {
1779 try clang_argv.appendSlice(arena, it.other_args);
1779 try cc_argv.appendSlice(arena, it.other_args);
17801780 },
17811781 .positional => switch (file_ext orelse Compilation.classifyFileExt(mem.sliceTo(it.only_arg, 0))) {
17821782 .assembly, .assembly_with_cpp, .c, .cpp, .ll, .bc, .h, .m, .mm, .cu => {
......@@ -1985,7 +1985,7 @@ fn buildOutputType(
19851985 {
19861986 mod_opts.optimize_mode = .Debug;
19871987 } else {
1988 try clang_argv.appendSlice(arena, it.other_args);
1988 try cc_argv.appendSlice(arena, it.other_args);
19891989 }
19901990 },
19911991 .debug => {
......@@ -1996,9 +1996,9 @@ fn buildOutputType(
19961996 mem.eql(u8, it.only_arg, "gline-tables-only"))
19971997 {
19981998 // We handled with strip = false above. but we also want reduced debug info.
1999 try clang_argv.append(arena, "-gline-tables-only");
1999 try cc_argv.append(arena, "-gline-tables-only");
20002000 } else {
2001 try clang_argv.appendSlice(arena, it.other_args);
2001 try cc_argv.appendSlice(arena, it.other_args);
20022002 }
20032003 },
20042004 .gdwarf32 => {
......@@ -2015,7 +2015,7 @@ fn buildOutputType(
20152015 } else if (mem.eql(u8, it.only_arg, "thread")) {
20162016 mod_opts.sanitize_thread = true;
20172017 } else {
2018 try clang_argv.appendSlice(arena, it.other_args);
2018 try cc_argv.appendSlice(arena, it.other_args);
20192019 }
20202020 },
20212021 .linker_script => linker_script = it.only_arg,
......@@ -2024,14 +2024,14 @@ fn buildOutputType(
20242024 // Have Clang print more infos, some tools such as CMake
20252025 // parse this to discover any implicit include and
20262026 // library dir to look-up into.
2027 try clang_argv.append(arena, "-v");
2027 try cc_argv.append(arena, "-v");
20282028 },
20292029 .dry_run => {
20302030 // This flag means "dry run". Clang will not actually output anything
20312031 // to the file system.
20322032 verbose_link = true;
20332033 disable_c_depfile = true;
2034 try clang_argv.append(arena, "-###");
2034 try cc_argv.append(arena, "-###");
20352035 },
20362036 .for_linker => try linker_args.append(it.only_arg),
20372037 .linker_input_z => {
......@@ -2043,14 +2043,14 @@ fn buildOutputType(
20432043 .m => try create_module.llvm_m_args.append(arena, it.only_arg),
20442044 .dep_file => {
20452045 disable_c_depfile = true;
2046 try clang_argv.appendSlice(arena, it.other_args);
2046 try cc_argv.appendSlice(arena, it.other_args);
20472047 },
20482048 .dep_file_to_stdout => { // -M, -MM
20492049 // "Like -MD, but also implies -E and writes to stdout by default"
20502050 // "Like -MMD, but also implies -E and writes to stdout by default"
20512051 c_out_mode = .preprocessor;
20522052 disable_c_depfile = true;
2053 try clang_argv.appendSlice(arena, it.other_args);
2053 try cc_argv.appendSlice(arena, it.other_args);
20542054 },
20552055 .framework_dir => try create_module.framework_dirs.append(arena, it.only_arg),
20562056 .framework => try create_module.frameworks.put(arena, it.only_arg, .{}),
......@@ -2595,7 +2595,7 @@ fn buildOutputType(
25952595 },
25962596 .root_src_path = fs.path.basename(src_path),
25972597 },
2598 .cc_argv = try clang_argv.toOwnedSlice(arena),
2598 .cc_argv = try cc_argv.toOwnedSlice(arena),
25992599 .inherited = mod_opts,
26002600 .target_arch_os_abi = target_arch_os_abi,
26012601 .target_mcpu = target_mcpu,