authorgravatar for 35124673+wyatt-radkiewicz@users.noreply.github.comWyatt Radkiewicz <35124673+wyatt-radkiewicz@users.noreply.github.com> 2025-02-22 15:22:54-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-02-22 14:22:54-08:00
log33ffbb32c9cfea28373b199003f94fa80353ee44
treec96d3181c830c748caec11587c3e115cf50053ef
parent36fc2d2607f350961b66654da7d2a28eade723a2
signaturebadge-check Signed by PGP key B5690EEEBB952194

std.zig.system.NativePaths: Add Homebrew paths (#22738)

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

lib/std/zig/system/NativePaths.zig+7-2
...@@ -81,7 +81,6 @@ pub fn detect(arena: Allocator, native_target: std.Target) !NativePaths {...@@ -81,7 +81,6 @@ pub fn detect(arena: Allocator, native_target: std.Target) !NativePaths {
81 return self;81 return self;
82 }82 }
8383
84 // TODO: consider also adding homebrew paths
85 // TODO: consider also adding macports paths84 // TODO: consider also adding macports paths
86 if (builtin.target.os.tag.isDarwin()) {85 if (builtin.target.os.tag.isDarwin()) {
87 if (std.zig.system.darwin.isSdkInstalled(arena)) sdk: {86 if (std.zig.system.darwin.isSdkInstalled(arena)) sdk: {
...@@ -89,8 +88,14 @@ pub fn detect(arena: Allocator, native_target: std.Target) !NativePaths {...@@ -89,8 +88,14 @@ pub fn detect(arena: Allocator, native_target: std.Target) !NativePaths {
89 try self.addLibDir(try std.fs.path.join(arena, &.{ sdk, "usr/lib" }));88 try self.addLibDir(try std.fs.path.join(arena, &.{ sdk, "usr/lib" }));
90 try self.addFrameworkDir(try std.fs.path.join(arena, &.{ sdk, "System/Library/Frameworks" }));89 try self.addFrameworkDir(try std.fs.path.join(arena, &.{ sdk, "System/Library/Frameworks" }));
91 try self.addIncludeDir(try std.fs.path.join(arena, &.{ sdk, "usr/include" }));90 try self.addIncludeDir(try std.fs.path.join(arena, &.{ sdk, "usr/include" }));
92 return self;
93 }91 }
92
93 // Check for homebrew paths
94 if (std.posix.getenv("HOMEBREW_PREFIX")) |prefix| {
95 try self.addLibDir(try std.fs.path.join(arena, &.{ prefix, "/lib" }));
96 try self.addIncludeDir(try std.fs.path.join(arena, &.{ prefix, "/include" }));
97 }
98
94 return self;99 return self;
95 }100 }
96101