authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-01-25 15:18:40-08:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-01-26 09:07:39+01:00
log92b20e42162675d35ffd27845e66b0f9213c00c2
tree97db6bcf633b125f7d09eda2bcef9f3110b75859
parent6a4986b2d6d002b7fc767697493e358d306a28e5

stf: do not call xcode-select or xcrun by absolute path in darwin sdk detection

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

lib/std/zig/system/darwin.zig+2-2
...@@ -15,7 +15,7 @@ pub const macos = @import("darwin/macos.zig");...@@ -15,7 +15,7 @@ pub const macos = @import("darwin/macos.zig");
15pub fn isSdkInstalled(allocator: Allocator) bool {15pub fn isSdkInstalled(allocator: Allocator) bool {
16 const result = std.process.Child.run(.{16 const result = std.process.Child.run(.{
17 .allocator = allocator,17 .allocator = allocator,
18 .argv = &.{ "/usr/bin/xcode-select", "--print-path" },18 .argv = &.{ "xcode-select", "--print-path" },
19 }) catch return false;19 }) catch return false;
2020
21 defer {21 defer {
...@@ -48,7 +48,7 @@ pub fn getSdk(allocator: Allocator, target: Target) ?[]const u8 {...@@ -48,7 +48,7 @@ pub fn getSdk(allocator: Allocator, target: Target) ?[]const u8 {
48 .visionos => if (is_simulator_abi) "xrsimulator" else "xros",48 .visionos => if (is_simulator_abi) "xrsimulator" else "xros",
49 else => return null,49 else => return null,
50 };50 };
51 const argv = &[_][]const u8{ "/usr/bin/xcrun", "--sdk", sdk, "--show-sdk-path" };51 const argv = &[_][]const u8{ "xcrun", "--sdk", sdk, "--show-sdk-path" };
52 const result = std.process.Child.run(.{ .allocator = allocator, .argv = argv }) catch return null;52 const result = std.process.Child.run(.{ .allocator = allocator, .argv = argv }) catch return null;
53 defer {53 defer {
54 allocator.free(result.stderr);54 allocator.free(result.stderr);