| ... | @@ -980,7 +980,26 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No | ... | @@ -980,7 +980,26 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No |
| 980 | try argv.append(entry); | 980 | try argv.append(entry); |
| 981 | } | 981 | } |
| 982 | | 982 | |
| 983 | try argv.appendSlice(positionals.items); | 983 | for (self.base.options.objects) |obj| { |
| | 984 | try argv.append(obj.path); |
| | 985 | } |
| | 986 | |
| | 987 | for (comp.c_object_table.keys()) |key| { |
| | 988 | try argv.append(key.status.success.object_path); |
| | 989 | } |
| | 990 | |
| | 991 | if (module_obj_path) |p| { |
| | 992 | try argv.append(p); |
| | 993 | } |
| | 994 | |
| | 995 | if (comp.compiler_rt_lib) |lib| { |
| | 996 | try argv.append(lib.full_object_path); |
| | 997 | } |
| | 998 | |
| | 999 | if (self.base.options.link_libcpp) { |
| | 1000 | try argv.append(comp.libcxxabi_static_lib.?.full_object_path); |
| | 1001 | try argv.append(comp.libcxx_static_lib.?.full_object_path); |
| | 1002 | } |
| 984 | | 1003 | |
| 985 | try argv.append("-o"); | 1004 | try argv.append("-o"); |
| 986 | try argv.append(full_out_path); | 1005 | try argv.append(full_out_path); |
| ... | @@ -988,7 +1007,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No | ... | @@ -988,7 +1007,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No |
| 988 | try argv.append("-lSystem"); | 1007 | try argv.append("-lSystem"); |
| 989 | try argv.append("-lc"); | 1008 | try argv.append("-lc"); |
| 990 | | 1009 | |
| 991 | for (search_lib_names.items) |l_name| { | 1010 | for (self.base.options.system_libs.keys()) |l_name| { |
| 992 | try argv.append(try std.fmt.allocPrint(arena, "-l{s}", .{l_name})); | 1011 | try argv.append(try std.fmt.allocPrint(arena, "-l{s}", .{l_name})); |
| 993 | } | 1012 | } |
| 994 | | 1013 | |
Jakub Konka <kubkon@jakubkonka.com> 2022-06-24 22:01:29+02:00
src