diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-11-06 13:22:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 13:22:03 -0500 |
| commit | a9e09a8be4ff6a15dabb1362a6833e6b0af66b22 (patch) | |
| tree | 67236efd6bbb875d2eef2c7068826dcc2e1abed1 /lib | |
| parent | a1a16a941e6e04c0f6f0d17c4c9f13d2ba32a9a1 (diff) | |
| parent | ab69b89d528c828e949bb2d2f3632401a2d382fe (diff) | |
| download | zig-a9e09a8be4ff6a15dabb1362a6833e6b0af66b22.tar.gz zig-a9e09a8be4ff6a15dabb1362a6833e6b0af66b22.zip | |
Merge pull request #6990 from kubkon/system-linker-hack
Re-enable system linker hack
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/std/build.zig | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/std/build.zig b/lib/std/build.zig index a1ac3f88f2..5666005fa4 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -1237,7 +1237,6 @@ pub const LibExeObjStep = struct { packages: ArrayList(Pkg), build_options_contents: std.ArrayList(u8), build_options_artifact_args: std.ArrayList(BuildOptionArtifactArg), - system_linker_hack: bool = false, object_src: []const u8, @@ -1898,10 +1897,6 @@ pub const LibExeObjStep = struct { self.exec_cmd_args = args; } - pub fn enableSystemLinkerHack(self: *LibExeObjStep) void { - self.system_linker_hack = true; - } - fn linkLibraryOrObject(self: *LibExeObjStep, other: *LibExeObjStep) void { self.step.dependOn(&other.step); self.link_objects.append(LinkObject{ .OtherStep = other }) catch unreachable; @@ -2283,10 +2278,6 @@ pub const LibExeObjStep = struct { } } - if (self.system_linker_hack) { - try zig_args.append("--system-linker-hack"); - } - if (self.valgrind_support) |valgrind_support| { if (valgrind_support) { try zig_args.append("-fvalgrind"); |
