authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-11-06 11:57:53+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-11-06 11:57:53+01:00
logab69b89d528c828e949bb2d2f3632401a2d382fe
tree64156d62331c6d5549e000f6a2d517da1e26df1a
parentb7c3ebcb9e3aefbdd82a43c7ab122931787c7805

Address review comments

2 files changed, 2 insertions(+), 2 deletions(-)

src/Compilation.zig+1-1
...@@ -480,7 +480,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {...@@ -480,7 +480,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
480 const darwin_options: DarwinOptions = if (build_options.have_llvm and comptime std.Target.current.isDarwin()) outer: {480 const darwin_options: DarwinOptions = if (build_options.have_llvm and comptime std.Target.current.isDarwin()) outer: {
481 const opts: DarwinOptions = if (use_lld and options.is_native_os and options.target.isDarwin()) inner: {481 const opts: DarwinOptions = if (use_lld and options.is_native_os and options.target.isDarwin()) inner: {
482 const syslibroot = try std.zig.system.getSDKPath(arena);482 const syslibroot = try std.zig.system.getSDKPath(arena);
483 const system_linker_hack = if (std.os.getenv("ZIG_SYSTEM_LINKER_HACK")) |_| true else false;483 const system_linker_hack = std.os.getenv("ZIG_SYSTEM_LINKER_HACK") != null;
484 break :inner .{484 break :inner .{
485 .syslibroot = syslibroot,485 .syslibroot = syslibroot,
486 .system_linker_hack = system_linker_hack,486 .system_linker_hack = system_linker_hack,
src/link/MachO.zig+1-1
...@@ -726,7 +726,7 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {...@@ -726,7 +726,7 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {
726 if (result.stderr.len != 0) {726 if (result.stderr.len != 0) {
727 std.log.warn("unexpected LD stderr: {}", .{result.stderr});727 std.log.warn("unexpected LD stderr: {}", .{result.stderr});
728 }728 }
729 if (result.term.Exited != 0) {729 if (result.term != .Exited or result.term.Exited != 0) {
730 // TODO parse this output and surface with the Compilation API rather than730 // TODO parse this output and surface with the Compilation API rather than
731 // directly outputting to stderr here.731 // directly outputting to stderr here.
732 std.debug.print("{}", .{result.stderr});732 std.debug.print("{}", .{result.stderr});