Commit eb1b2f5c58888bfcab7e00378502f82594536aec | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2022-07-22 14:32:56+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-07-22 14:11:23-07:00
log	eb1b2f5c58888bfcab7e00378502f82594536aec
tree	89435c4aca842324cc5c7fa6b91373ca97ae2c35
parent	5dd59a54238b63cb52bb91d3cf803cb0196abb64

macos: add /usr/local/* paths conditional on macOS major version

`/usr/local/include`, `/usr/local/lib` and `/Library/Frameworks`
have been deprecated since approximately macOS 11, and so to avoid
redundant and misinformed warning messages generated by the linker,
add those dirs only when natively targeting macOS 10.x.x or below.

1 files changed, 6 insertions(+), 5 deletions(-)

lib
- std
  - zig
    system
    NativePaths.zig

lib/std/zig/system/NativePaths.zig+6-5

 @@ -84,14 +84,15 @@ pub fn detect(allocator: Allocator, native_info: NativeTargetInfo) !NativePaths
     if (comptime builtin.target.isDarwin()) {
         try self.addIncludeDir("/usr/include");
-        try self.addIncludeDir("/usr/local/include");
         try self.addLibDir("/usr/lib");
-        try self.addLibDir("/usr/local/lib");
-        try self.addFrameworkDir("/Library/Frameworks");
         try self.addFrameworkDir("/System/Library/Frameworks");
+        if (builtin.target.os.version_range.semver.min.major < 11) {
+            try self.addIncludeDir("/usr/local/include");
+            try self.addLibDir("/usr/local/lib");
+            try self.addFrameworkDir("/Library/Frameworks");
+        }
         return self;
     }