authorgravatar for stephen@hexops.comStephen Gutekanst <stephen@hexops.com> 2022-02-20 13:43:52-07:00
committergravatar for stephen@hexops.comStephen Gutekanst <stephen@hexops.com> 2022-02-20 13:50:09-07:00
loge41d4df93cf78b7ecccd959472dc653dc089f8aa
treecd41631cf1883ba5915e22a4e3fd634115afe97b
parent0778f644b519a83e95848d05d5a9e6241f8f41f3

enable passing build-[lib|exe|obj] params via @args.rsp file

This change enables `zig build-lib` and friends to take a response file of command line arguments, for example: ```sh zig build-lib @args.rsp ``` Which effectively does the same thing as this in Bash: ```sh zig build-lib $(cat args.rsp) ``` Being able to use a file for arguments is important as one can quickly exceed the 32 KiB limit that Windows imposes on arguments to a process. Helps #10693 Signed-off-by: Stephen Gutekanst <stephen@hexops.com>

1 files changed, 54 insertions(+), 38 deletions(-)

src/main.zig+54-38
......@@ -768,14 +768,30 @@ fn buildOutputType(
768768 var process_args_iter = try process.argsWithAllocator(arena);
769769 _ = process_args_iter.skip(); // "zig"
770770 _ = process_args_iter.skip(); // e.g. "build-lib"
771 var resp_file_args_iter: ?ArgIteratorResponseFile = null;
771772
772 args_loop: while (process_args_iter.next()) |arg| {
773 var getNextArg = (struct {
774 pub fn getNextArg(_process_args_iter: *process.ArgIterator, maybe_resp_file_args_iter: *?ArgIteratorResponseFile) ?[:0]const u8 {
775 if (_process_args_iter.next()) |proc_arg| return proc_arg;
776 if (maybe_resp_file_args_iter.*) |*iter| return iter.next();
777 return null;
778 }
779 }).getNextArg;
780
781 args_loop: while (getNextArg(&process_args_iter, &resp_file_args_iter)) |arg| {
773782 var args_index = process_args_iter.inner.index;
774783 if (resp_file_args_iter) |iter| {
775784 args_index = iter.index;
776785 }
777786
778 if (mem.startsWith(u8, arg, "-")) {
787 if (mem.startsWith(u8, arg, "@")) {
788 // This is a "compiler response file". We must parse the file and treat its
789 // contents as command line parameters.
790 const resp_file_path = arg[1..];
791 resp_file_args_iter = initArgIteratorResponseFile(arena, resp_file_path) catch |err| {
792 fatal("unable to read response file '{s}': {s}", .{ resp_file_path, @errorName(err) });
793 };
794 } else if (mem.startsWith(u8, arg, "-")) {
779795 if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
780796 try io.getStdOut().writeAll(usage_build_generic);
781797 return cleanExit();
......@@ -789,8 +805,8 @@ fn buildOutputType(
789805 fatal("unexpected end-of-parameter mark: --", .{});
790806 }
791807 } else if (mem.eql(u8, arg, "--pkg-begin")) {
792 const pkg_name = process_args_iter.next();
793 const pkg_path = process_args_iter.next();
808 const pkg_name = getNextArg(&process_args_iter, &resp_file_args_iter);
809 const pkg_path = getNextArg(&process_args_iter, &resp_file_args_iter);
794810 if (pkg_name == null or pkg_path == null) fatal("Expected 2 arguments after {s}", .{arg});
795811
796812 const new_cur_pkg = Package.create(
......@@ -806,25 +822,25 @@ fn buildOutputType(
806822 cur_pkg = cur_pkg.parent orelse
807823 fatal("encountered --pkg-end with no matching --pkg-begin", .{});
808824 } else if (mem.eql(u8, arg, "--main-pkg-path")) {
809 const next_arg = process_args_iter.next();
825 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
810826 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
811827 main_pkg_path = next_arg.?;
812828 } else if (mem.eql(u8, arg, "-cflags")) {
813829 extra_cflags.shrinkRetainingCapacity(0);
814830 while (true) {
815 const next_arg = process_args_iter.next();
831 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
816832 if (next_arg == null) fatal("expected -- after -cflags", .{});
817833 if (mem.eql(u8, next_arg.?, "--")) break;
818834 try extra_cflags.append(next_arg.?);
819835 }
820836 } else if (mem.eql(u8, arg, "--color")) {
821 const next_arg = process_args_iter.next();
837 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
822838 if (next_arg == null) fatal("expected [auto|on|off] after --color", .{});
823839 color = std.meta.stringToEnum(Color, next_arg.?) orelse {
824840 fatal("expected [auto|on|off] after --color, found '{s}'", .{next_arg.?});
825841 };
826842 } else if (mem.eql(u8, arg, "--subsystem")) {
827 const next_arg = process_args_iter.next();
843 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
828844 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
829845 if (mem.eql(u8, next_arg.?, "console")) {
830846 subsystem = .Console;
......@@ -857,65 +873,65 @@ fn buildOutputType(
857873 });
858874 }
859875 } else if (mem.eql(u8, arg, "-O")) {
860 const next_arg = process_args_iter.next();
876 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
861877 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
862878 optimize_mode_string = next_arg.?;
863879 } else if (mem.eql(u8, arg, "--entry")) {
864 const next_arg = process_args_iter.next();
880 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
865881 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
866882 entry = next_arg.?;
867883 } else if (mem.eql(u8, arg, "--stack")) {
868 const next_arg = process_args_iter.next();
884 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
869885 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
870886 stack_size_override = std.fmt.parseUnsigned(u64, next_arg.?, 0) catch |err| {
871887 fatal("unable to parse '{s}': {s}", .{ arg, @errorName(err) });
872888 };
873889 } else if (mem.eql(u8, arg, "--image-base")) {
874 const next_arg = process_args_iter.next();
890 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
875891 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
876892 image_base_override = std.fmt.parseUnsigned(u64, next_arg.?, 0) catch |err| {
877893 fatal("unable to parse '{s}': {s}", .{ arg, @errorName(err) });
878894 };
879895 } else if (mem.eql(u8, arg, "--name")) {
880 const next_arg = process_args_iter.next();
896 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
881897 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
882898 provided_name = next_arg.?;
883899 } else if (mem.eql(u8, arg, "-rpath")) {
884 const next_arg = process_args_iter.next();
900 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
885901 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
886902 try rpath_list.append(next_arg.?);
887903 } else if (mem.eql(u8, arg, "--library-directory") or mem.eql(u8, arg, "-L")) {
888 const next_arg = process_args_iter.next();
904 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
889905 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
890906 try lib_dirs.append(next_arg.?);
891907 } else if (mem.eql(u8, arg, "-F")) {
892 const next_arg = process_args_iter.next();
908 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
893909 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
894910 try framework_dirs.append(next_arg.?);
895911 } else if (mem.eql(u8, arg, "-framework")) {
896 const next_arg = process_args_iter.next();
912 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
897913 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
898914 try frameworks.append(next_arg.?);
899915 } else if (mem.eql(u8, arg, "-install_name")) {
900 const next_arg = process_args_iter.next();
916 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
901917 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
902918 install_name = next_arg.?;
903919 } else if (mem.eql(u8, arg, "-T") or mem.eql(u8, arg, "--script")) {
904 const next_arg = process_args_iter.next();
920 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
905921 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
906922 linker_script = next_arg.?;
907923 } else if (mem.eql(u8, arg, "--version-script")) {
908 const next_arg = process_args_iter.next();
924 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
909925 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
910926 version_script = next_arg.?;
911927 } else if (mem.eql(u8, arg, "--library") or mem.eql(u8, arg, "-l")) {
912 const next_arg = process_args_iter.next();
928 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
913929 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
914930 // We don't know whether this library is part of libc or libc++ until
915931 // we resolve the target, so we simply append to the list for now.
916932 try system_libs.put(next_arg.?, .{ .needed = false });
917933 } else if (mem.eql(u8, arg, "--needed-library") or mem.eql(u8, arg, "-needed-l")) {
918 const next_arg = process_args_iter.next();
934 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
919935 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
920936 try system_libs.put(next_arg.?, .{ .needed = true });
921937 } else if (mem.eql(u8, arg, "-D") or
......@@ -926,27 +942,27 @@ fn buildOutputType(
926942 mem.eql(u8, arg, "-iframework") or
927943 mem.eql(u8, arg, "-iframeworkwithsysroot"))
928944 {
929 const next_arg = process_args_iter.next();
945 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
930946 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
931947 try clang_argv.append(arg);
932948 try clang_argv.append(next_arg.?);
933949 } else if (mem.eql(u8, arg, "--version")) {
934 const next_arg = process_args_iter.next();
950 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
935951 if (next_arg == null) fatal("expected parameter after --version", .{});
936952 version = std.builtin.Version.parse(next_arg.?) catch |err| {
937953 fatal("unable to parse --version '{s}': {s}", .{ next_arg.?, @errorName(err) });
938954 };
939955 have_version = true;
940956 } else if (mem.eql(u8, arg, "-target")) {
941 const next_arg = process_args_iter.next();
957 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
942958 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
943959 target_arch_os_abi = next_arg.?;
944960 } else if (mem.eql(u8, arg, "-mcpu")) {
945 const next_arg = process_args_iter.next();
961 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
946962 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
947963 target_mcpu = next_arg.?;
948964 } else if (mem.eql(u8, arg, "-mcmodel")) {
949 const next_arg = process_args_iter.next();
965 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
950966 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
951967 machine_code_model = parseCodeModel(next_arg.?);
952968 } else if (mem.startsWith(u8, arg, "-ofmt=")) {
......@@ -958,45 +974,45 @@ fn buildOutputType(
958974 } else if (mem.startsWith(u8, arg, "-O")) {
959975 optimize_mode_string = arg["-O".len..];
960976 } else if (mem.eql(u8, arg, "--dynamic-linker")) {
961 const next_arg = process_args_iter.next();
977 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
962978 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
963979 target_dynamic_linker = next_arg.?;
964980 } else if (mem.eql(u8, arg, "--sysroot")) {
965 const next_arg = process_args_iter.next();
981 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
966982 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
967983 sysroot = next_arg.?;
968984 try clang_argv.append("-isysroot");
969985 try clang_argv.append(next_arg.?);
970986 } else if (mem.eql(u8, arg, "--libc")) {
971 const next_arg = process_args_iter.next();
987 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
972988 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
973989 libc_paths_file = next_arg.?;
974990 } else if (mem.eql(u8, arg, "--test-filter")) {
975 const next_arg = process_args_iter.next();
991 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
976992 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
977993 test_filter = next_arg.?;
978994 } else if (mem.eql(u8, arg, "--test-name-prefix")) {
979 const next_arg = process_args_iter.next();
995 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
980996 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
981997 test_name_prefix = next_arg.?;
982998 } else if (mem.eql(u8, arg, "--test-cmd")) {
983 const next_arg = process_args_iter.next();
999 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
9841000 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
9851001 try test_exec_args.append(next_arg.?);
9861002 } else if (mem.eql(u8, arg, "--cache-dir")) {
987 const next_arg = process_args_iter.next();
1003 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
9881004 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
9891005 override_local_cache_dir = next_arg.?;
9901006 } else if (mem.eql(u8, arg, "--global-cache-dir")) {
991 const next_arg = process_args_iter.next();
1007 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
9921008 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
9931009 override_global_cache_dir = next_arg.?;
9941010 } else if (mem.eql(u8, arg, "--zig-lib-dir")) {
995 const next_arg = process_args_iter.next();
1011 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
9961012 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
9971013 override_lib_dir = next_arg.?;
9981014 } else if (mem.eql(u8, arg, "--debug-log")) {
999 const next_arg = process_args_iter.next();
1015 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
10001016 if (next_arg == null) fatal("expected parameter after {s}", .{arg});
10011017 if (!build_options.enable_logging) {
10021018 std.log.warn("Zig was compiled without logging enabled (-Dlog). --debug-log has no effect.", .{});
......@@ -1174,7 +1190,7 @@ fn buildOutputType(
11741190 } else if (mem.eql(u8, arg, "-fno-allow-shlib-undefined")) {
11751191 linker_allow_shlib_undefined = false;
11761192 } else if (mem.eql(u8, arg, "-z")) {
1177 const next_arg = process_args_iter.next();
1193 const next_arg = getNextArg(&process_args_iter, &resp_file_args_iter);
11781194 if (next_arg == null) fatal("expected linker extension flag after '{s}'", .{arg});
11791195 const z_arg = next_arg.?;
11801196 if (mem.eql(u8, z_arg, "nodelete")) {