falsepattern/zig-glfw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glfw: remove macOS sysroot workaround (not needed in latest Zig)

Browse source 
Also, removing is required in order to workaround an issue with includes.

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-09-11 20:16:27 -07:00 • committed by Stephen Gutekanst
parent 57f41f8808
commit 6446dd782e
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
glfw/build.zig
View file

@ -243,12 +243,6 @@ fn includeSdkMacOS(b: *Builder, step: *std.build.LibExeObjStep) void {
var sdk_root_libs = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/usr/lib" }) catch unreachable; var sdk_root_libs = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/usr/lib" }) catch unreachable;
defer b.allocator.free(sdk_root_libs); defer b.allocator.free(sdk_root_libs);
step.addLibPath(sdk_root_libs); step.addLibPath(sdk_root_libs);
// TODO(slimsag): Without setting sysroot, zld fails to resolve /usr/lib/libobjc.A.dylib when specifying -Dtarget=x86_64-macos
// Presumably has something to do with https://github.com/ziglang/zig/issues/6996 - I think zld doesn't consider addLibPath/addFrameworkDir
// resolution as part of dependant libs: https://github.com/ziglang/zig/blob/2d855745f91852af92ad970feef96e55919993d3/src/link/MachO/Dylib.zig#L477-L483
var sdk_sysroot = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/" }) catch unreachable;
b.sysroot = sdk_sysroot; // TODO(slimsag): leaks, b.sysroot doesn't get free'd by builder?
} }
fn includeSdkLinuxX8664(b: *Builder, step: *std.build.LibExeObjStep) void { fn includeSdkLinuxX8664(b: *Builder, step: *std.build.LibExeObjStep) void {