fix: scope C dependency include paths to their module

.bazelrc

@@ -18,8 +18,8 @@ build --workspace_status_command=$(pwd)/workspace_status.sh
 # To update these lines, execute
 # `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
 # docs: https://bazel.build/reference/command-line-reference#flag--deleted_packages
-build --deleted_packages=e2e/workspace,e2e/workspace/bazel_builtin,e2e/workspace/c-sources,e2e/workspace/canonical-name-module,e2e/workspace/canonical-name-module/other,e2e/workspace/cc-dependencies,e2e/workspace/cc-dependencies/shared-library,e2e/workspace/cc-dependencies/static-library,e2e/workspace/cc-dependencies/static-library-cdeps,e2e/workspace/configure-mode,e2e/workspace/configure-target,e2e/workspace/configure-threaded,e2e/workspace/configure-use_cc_common_link,e2e/workspace/configure-use_cc_common_link/shared-library,e2e/workspace/configure-use_cc_common_link/static-library,e2e/workspace/configure-version,e2e/workspace/data-dependencies,e2e/workspace/embed-file,e2e/workspace/env-attr,e2e/workspace/import-name-attr,e2e/workspace/import-names-attr,e2e/workspace/include-dependencies,e2e/workspace/include-dependencies/zig-include,e2e/workspace/include-dependencies/zig-include-define,e2e/workspace/include-dependencies/zig-include-isystem,e2e/workspace/include-dependencies/zig-std-include,e2e/workspace/link-dependencies,e2e/workspace/link-dependencies/shared-library,e2e/workspace/link-dependencies/static-library,e2e/workspace/linker-script,e2e/workspace/linkopts-attr,e2e/workspace/location-expansion,e2e/workspace/multiple-sources-and-packages-test,e2e/workspace/multiple-sources-binary,e2e/workspace/root-module-from-single-dependency,e2e/workspace/runfiles-library,e2e/workspace/runfiles-library/dependency,e2e/workspace/runfiles-library/dependency/transitive-dependency,e2e/workspace/simple-binary,e2e/workspace/simple-cmake-library,e2e/workspace/simple-library,e2e/workspace/simple-shared-library,e2e/workspace/simple-test,e2e/workspace/test-runner-attr,e2e/workspace/third_party/arocc,e2e/workspace/third_party/translate-c,e2e/workspace/toolchain-glibc-version,e2e/workspace/transitive-zig-modules-binary,e2e/workspace/transitive-zig-modules-binary/hello-world,e2e/workspace/transitive-zig-modules-binary/hello-world/data,e2e/workspace/transitive-zig-modules-binary/hello-world/data/hello,e2e/workspace/transitive-zig-modules-binary/hello-world/data/world,e2e/workspace/transitive-zig-modules-binary/hello-world/io,e2e/workspace/translate-c/transitive-cc-library-zig-binary,e2e/workspace/zig-docs,e2e/workspace/zig-header,e2e/workspace/zig-module-binary,e2e/workspace/zig-module-binary/data,e2e/workspace/zig-module-binary/io,zig/tests/integration_tests/minimal,zig/tests/integration_tests/mirrors,zig/tests/integration_tests/workspace,zig/tests/integration_tests/workspace/custom_interpreter,zig/tests/integration_tests/workspace/env-attr,zig/tests/integration_tests/workspace/runfiles
-query --deleted_packages=e2e/workspace,e2e/workspace/bazel_builtin,e2e/workspace/c-sources,e2e/workspace/canonical-name-module,e2e/workspace/canonical-name-module/other,e2e/workspace/cc-dependencies,e2e/workspace/cc-dependencies/shared-library,e2e/workspace/cc-dependencies/static-library,e2e/workspace/cc-dependencies/static-library-cdeps,e2e/workspace/configure-mode,e2e/workspace/configure-target,e2e/workspace/configure-threaded,e2e/workspace/configure-use_cc_common_link,e2e/workspace/configure-use_cc_common_link/shared-library,e2e/workspace/configure-use_cc_common_link/static-library,e2e/workspace/configure-version,e2e/workspace/data-dependencies,e2e/workspace/embed-file,e2e/workspace/env-attr,e2e/workspace/import-name-attr,e2e/workspace/import-names-attr,e2e/workspace/include-dependencies,e2e/workspace/include-dependencies/zig-include,e2e/workspace/include-dependencies/zig-include-define,e2e/workspace/include-dependencies/zig-include-isystem,e2e/workspace/include-dependencies/zig-std-include,e2e/workspace/link-dependencies,e2e/workspace/link-dependencies/shared-library,e2e/workspace/link-dependencies/static-library,e2e/workspace/linker-script,e2e/workspace/linkopts-attr,e2e/workspace/location-expansion,e2e/workspace/multiple-sources-and-packages-test,e2e/workspace/multiple-sources-binary,e2e/workspace/root-module-from-single-dependency,e2e/workspace/runfiles-library,e2e/workspace/runfiles-library/dependency,e2e/workspace/runfiles-library/dependency/transitive-dependency,e2e/workspace/simple-binary,e2e/workspace/simple-cmake-library,e2e/workspace/simple-library,e2e/workspace/simple-shared-library,e2e/workspace/simple-test,e2e/workspace/test-runner-attr,e2e/workspace/third_party/arocc,e2e/workspace/third_party/translate-c,e2e/workspace/toolchain-glibc-version,e2e/workspace/transitive-zig-modules-binary,e2e/workspace/transitive-zig-modules-binary/hello-world,e2e/workspace/transitive-zig-modules-binary/hello-world/data,e2e/workspace/transitive-zig-modules-binary/hello-world/data/hello,e2e/workspace/transitive-zig-modules-binary/hello-world/data/world,e2e/workspace/transitive-zig-modules-binary/hello-world/io,e2e/workspace/translate-c/transitive-cc-library-zig-binary,e2e/workspace/zig-docs,e2e/workspace/zig-header,e2e/workspace/zig-module-binary,e2e/workspace/zig-module-binary/data,e2e/workspace/zig-module-binary/io,zig/tests/integration_tests/minimal,zig/tests/integration_tests/mirrors,zig/tests/integration_tests/workspace,zig/tests/integration_tests/workspace/custom_interpreter,zig/tests/integration_tests/workspace/env-attr,zig/tests/integration_tests/workspace/runfiles
+build --deleted_packages=e2e/workspace,e2e/workspace/bazel_builtin,e2e/workspace/c-sources,e2e/workspace/canonical-name-module,e2e/workspace/canonical-name-module/other,e2e/workspace/cc-dependencies,e2e/workspace/cc-dependencies/shared-library,e2e/workspace/cc-dependencies/static-library,e2e/workspace/cc-dependencies/static-library-cdeps,e2e/workspace/configure-mode,e2e/workspace/configure-target,e2e/workspace/configure-threaded,e2e/workspace/configure-use_cc_common_link,e2e/workspace/configure-use_cc_common_link/shared-library,e2e/workspace/configure-use_cc_common_link/static-library,e2e/workspace/configure-version,e2e/workspace/data-dependencies,e2e/workspace/embed-file,e2e/workspace/env-attr,e2e/workspace/import-name-attr,e2e/workspace/import-names-attr,e2e/workspace/include-dependencies,e2e/workspace/include-dependencies/zig-include,e2e/workspace/include-dependencies/zig-include-define,e2e/workspace/include-dependencies/zig-include-isystem,e2e/workspace/include-dependencies/zig-include-transitive,e2e/workspace/include-dependencies/zig-std-include,e2e/workspace/link-dependencies,e2e/workspace/link-dependencies/shared-library,e2e/workspace/link-dependencies/static-library,e2e/workspace/linker-script,e2e/workspace/linkopts-attr,e2e/workspace/location-expansion,e2e/workspace/multiple-sources-and-packages-test,e2e/workspace/multiple-sources-binary,e2e/workspace/root-module-from-single-dependency,e2e/workspace/runfiles-library,e2e/workspace/runfiles-library/dependency,e2e/workspace/runfiles-library/dependency/transitive-dependency,e2e/workspace/simple-binary,e2e/workspace/simple-cmake-library,e2e/workspace/simple-library,e2e/workspace/simple-shared-library,e2e/workspace/simple-test,e2e/workspace/test-runner-attr,e2e/workspace/third_party/arocc,e2e/workspace/third_party/translate-c,e2e/workspace/toolchain-glibc-version,e2e/workspace/transitive-zig-modules-binary,e2e/workspace/transitive-zig-modules-binary/hello-world,e2e/workspace/transitive-zig-modules-binary/hello-world/data,e2e/workspace/transitive-zig-modules-binary/hello-world/data/hello,e2e/workspace/transitive-zig-modules-binary/hello-world/data/world,e2e/workspace/transitive-zig-modules-binary/hello-world/io,e2e/workspace/translate-c/transitive-cc-library-zig-binary,e2e/workspace/zig-docs,e2e/workspace/zig-header,e2e/workspace/zig-module-binary,e2e/workspace/zig-module-binary/data,e2e/workspace/zig-module-binary/io,zig/tests/integration_tests/minimal,zig/tests/integration_tests/mirrors,zig/tests/integration_tests/workspace,zig/tests/integration_tests/workspace/custom_interpreter,zig/tests/integration_tests/workspace/env-attr,zig/tests/integration_tests/workspace/runfiles
+query --deleted_packages=e2e/workspace,e2e/workspace/bazel_builtin,e2e/workspace/c-sources,e2e/workspace/canonical-name-module,e2e/workspace/canonical-name-module/other,e2e/workspace/cc-dependencies,e2e/workspace/cc-dependencies/shared-library,e2e/workspace/cc-dependencies/static-library,e2e/workspace/cc-dependencies/static-library-cdeps,e2e/workspace/configure-mode,e2e/workspace/configure-target,e2e/workspace/configure-threaded,e2e/workspace/configure-use_cc_common_link,e2e/workspace/configure-use_cc_common_link/shared-library,e2e/workspace/configure-use_cc_common_link/static-library,e2e/workspace/configure-version,e2e/workspace/data-dependencies,e2e/workspace/embed-file,e2e/workspace/env-attr,e2e/workspace/import-name-attr,e2e/workspace/import-names-attr,e2e/workspace/include-dependencies,e2e/workspace/include-dependencies/zig-include,e2e/workspace/include-dependencies/zig-include-define,e2e/workspace/include-dependencies/zig-include-isystem,e2e/workspace/include-dependencies/zig-include-transitive,e2e/workspace/include-dependencies/zig-std-include,e2e/workspace/link-dependencies,e2e/workspace/link-dependencies/shared-library,e2e/workspace/link-dependencies/static-library,e2e/workspace/linker-script,e2e/workspace/linkopts-attr,e2e/workspace/location-expansion,e2e/workspace/multiple-sources-and-packages-test,e2e/workspace/multiple-sources-binary,e2e/workspace/root-module-from-single-dependency,e2e/workspace/runfiles-library,e2e/workspace/runfiles-library/dependency,e2e/workspace/runfiles-library/dependency/transitive-dependency,e2e/workspace/simple-binary,e2e/workspace/simple-cmake-library,e2e/workspace/simple-library,e2e/workspace/simple-shared-library,e2e/workspace/simple-test,e2e/workspace/test-runner-attr,e2e/workspace/third_party/arocc,e2e/workspace/third_party/translate-c,e2e/workspace/toolchain-glibc-version,e2e/workspace/transitive-zig-modules-binary,e2e/workspace/transitive-zig-modules-binary/hello-world,e2e/workspace/transitive-zig-modules-binary/hello-world/data,e2e/workspace/transitive-zig-modules-binary/hello-world/data/hello,e2e/workspace/transitive-zig-modules-binary/hello-world/data/world,e2e/workspace/transitive-zig-modules-binary/hello-world/io,e2e/workspace/translate-c/transitive-cc-library-zig-binary,e2e/workspace/zig-docs,e2e/workspace/zig-header,e2e/workspace/zig-module-binary,e2e/workspace/zig-module-binary/data,e2e/workspace/zig-module-binary/io,zig/tests/integration_tests/minimal,zig/tests/integration_tests/mirrors,zig/tests/integration_tests/workspace,zig/tests/integration_tests/workspace/custom_interpreter,zig/tests/integration_tests/workspace/env-attr,zig/tests/integration_tests/workspace/runfiles
 
 # Load any settings specific to the current user.
 # Place settings that should affect the integration tests into `.bazelrc.ic.user`.

e2e/workspace/cc-dependencies/static-library-cdeps/BUILD.bazel

@@ -29,5 +29,10 @@ cc_test(
     name = "mul-test",
     size = "small",
     srcs = ["mul-test.c"],
+    # fails on macOS, see //cc-dependencies/static-library:add-test
+    target_compatible_with = select({
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
     deps = [":mul-small"],
 )

e2e/workspace/cc-dependencies/static-library/BUILD.bazel

@@ -17,6 +17,12 @@ cc_test(
     name = "add-test",
     size = "small",
     srcs = ["add-test.c"],
+    # fails on MacOS with, see https://github.com/hermeticbuild/rules_zig/actions/runs/29501161934/job/87632738367?pr=673#step:3:145
+    #   ld: 64-bit mach-o member 'libadd_zcu.o' not 8-byte aligned in 'bazel-out/darwin_arm64-fastbuild-ST-8e42560474ff/bin/cc-dependencies/static-library/libadd.a'
+    target_compatible_with = select({
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
     deps = [":add-small"],
 )
 
@@ -43,5 +49,10 @@ cc_test(
     name = "mul-test",
     size = "small",
     srcs = ["mul-test.c"],
+    # See add-test above.
+    target_compatible_with = select({
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
     deps = [":mul-small"],
 )

e2e/workspace/configure-use_cc_common_link/shared-library/BUILD.bazel

@@ -37,6 +37,10 @@ zig_configure_binary(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )
@@ -81,6 +85,10 @@ zig_configure(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )
@@ -105,6 +113,10 @@ zig_configure_test(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )
@@ -126,6 +138,10 @@ zig_configure(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )

e2e/workspace/configure-use_cc_common_link/static-library/BUILD.bazel

@@ -24,6 +24,10 @@ zig_configure_binary(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )
@@ -62,6 +66,10 @@ zig_configure(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )
@@ -83,6 +91,10 @@ zig_configure_test(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )

e2e/workspace/include-dependencies/zig-include-transitive/BUILD.bazel

@@ -0,0 +1,44 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
+load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_zig//zig:defs.bzl", "zig_binary", "zig_library")
+
+cc_library(
+    name = "header",
+    hdrs = ["header.h"],
+    includes = ["."],
+)
+
+zig_library(
+    name = "cimport",
+    main = "cimport.zig",
+    deps = [":header"],
+)
+
+zig_binary(
+    name = "binary",
+    main = "main.zig",
+    deps = [":cimport"],
+)
+
+build_test(
+    name = "build",
+    size = "small",
+    targets = [
+        ":binary",
+    ],
+)
+
+genrule(
+    name = "output",
+    outs = ["output.actual"],
+    cmd = "$(execpath :binary) > $(OUTS)",
+    tools = [":binary"],
+)
+
+diff_test(
+    name = "output_test",
+    size = "small",
+    file1 = ":output.expected",
+    file2 = ":output.actual",
+)

e2e/workspace/include-dependencies/zig-include-transitive/cimport.zig

@@ -0,0 +1,5 @@
+const c = @cImport({
+    @cInclude("header.h");
+});
+
+pub const three: u8 = c.THREE;

e2e/workspace/include-dependencies/zig-include-transitive/header.h

@@ -0,0 +1 @@
+#define THREE 3

e2e/workspace/include-dependencies/zig-include-transitive/main.zig

@@ -0,0 +1,23 @@
+const builtin = @import("builtin");
+const std = @import("std");
+const cimport = @import("cimport");
+
+const is_zig_0_16_or_later = builtin.zig_version.major == 0 and builtin.zig_version.minor >= 16;
+
+pub const main = if (is_zig_0_16_or_later) main_016 else main_pre_016;
+
+fn main_pre_016() !void {
+    var buffer: [512]u8 = undefined;
+    var writer = std.fs.File.stdout().writer(&buffer);
+    const stdout = &writer.interface;
+    try stdout.print("{d}\n", .{cimport.three});
+    try stdout.flush();
+}
+
+fn main_016(init: std.process.Init) !void {
+    var buffer: [512]u8 = undefined;
+    var writer = std.Io.File.stdout().writer(init.io, &buffer);
+    const stdout = &writer.interface;
+    try stdout.print("{d}\n", .{cimport.three});
+    try stdout.flush();
+}

e2e/workspace/include-dependencies/zig-include-transitive/output.expected

@@ -0,0 +1 @@
+3

e2e/workspace/linkopts-attr/BUILD.bazel

@@ -31,6 +31,10 @@ zig_configure_binary(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )
@@ -44,6 +48,10 @@ zig_configure(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )
@@ -57,6 +65,10 @@ zig_configure_test(
         # https://github.com/ziglang/zig/issues/25069
         "@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
         "//conditions:default": [],
+    }) + select({
+        # fails on macOS, see //cc-dependencies/static-library:add-test
+        "@platforms//os:macos": ["@platforms//:incompatible"],
+        "//conditions:default": [],
     }),
     use_cc_common_link = 1,
 )