From 09579e649df224d4299a104a1570c3ecde07760e Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 6 Mar 2022 02:05:45 -0700 Subject: [PATCH] Revert "glfw: system_sdk: use addIncludeDir over addSystemIncludeDir" This reverts commit 5f382f93658585d176bff75672412e4c57aa2f17. I forgot that system include dirs also silence some warnings that are present in system headers, so we can't really do this. --- glfw/system_sdk.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glfw/system_sdk.zig b/glfw/system_sdk.zig index 53357b19..76e8575d 100644 --- a/glfw/system_sdk.zig +++ b/glfw/system_sdk.zig @@ -77,7 +77,7 @@ fn includeSdkMacOS(b: *Builder, step: *std.build.LibExeObjStep, options: Options if (options.set_sysroot) { step.addFrameworkDir("/System/Library/Frameworks"); - step.addIncludeDir("/usr/include"); + step.addSystemIncludeDir("/usr/include"); step.addLibPath("/usr/lib"); var sdk_sysroot = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/" }) catch unreachable; @@ -89,7 +89,7 @@ fn includeSdkMacOS(b: *Builder, step: *std.build.LibExeObjStep, options: Options step.addFrameworkDir(sdk_framework_dir); var sdk_include_dir = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/usr/include" }) catch unreachable; - step.addIncludeDir(sdk_include_dir); + step.addSystemIncludeDir(sdk_include_dir); var sdk_lib_dir = std.fs.path.join(b.allocator, &.{ sdk_root_dir, "root/usr/lib" }) catch unreachable; step.addLibPath(sdk_lib_dir); @@ -112,8 +112,8 @@ fn includeSdkLinuxX8664(b: *Builder, step: *std.build.LibExeObjStep, options: Op b.allocator.free(wayland_protocols_include); b.allocator.free(sdk_root_libs); } - step.addIncludeDir(sdk_root_includes); - step.addIncludeDir(wayland_protocols_include); + step.addSystemIncludeDir(sdk_root_includes); + step.addSystemIncludeDir(wayland_protocols_include); step.addLibPath(sdk_root_libs); }