Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/rules.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ zig_configure_binary(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

zig_static_library(
Expand All @@ -60,7 +60,7 @@ zig_configure(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

zig_shared_library(
Expand All @@ -82,7 +82,7 @@ zig_configure(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

zig_test(
Expand All @@ -106,7 +106,7 @@ zig_configure_test(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

zig_shared_library(
Expand All @@ -127,7 +127,7 @@ zig_configure(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

genrule(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ zig_configure_binary(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

zig_static_library(
Expand All @@ -44,7 +44,7 @@ zig_configure(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

zig_shared_library(
Expand All @@ -63,7 +63,7 @@ zig_configure(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

zig_test(
Expand All @@ -84,7 +84,7 @@ zig_configure_test(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

genrule(
Expand Down
6 changes: 3 additions & 3 deletions e2e/workspace/linkopts-attr/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ zig_configure_binary(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

zig_configure(
Expand All @@ -45,7 +45,7 @@ zig_configure(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

zig_configure_test(
Expand All @@ -58,7 +58,7 @@ zig_configure_test(
"@zig_toolchains//:0.15.2": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
use_cc_common_link = True,
use_cc_common_link = 1,
)

build_test(
Expand Down
16 changes: 12 additions & 4 deletions zig/private/zig_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ def _zig_transition_impl(settings, attr):
result["//command_line_option:platforms"] = str(attr.target)
if attr.zig_version:
result["@zig_toolchains//:version"] = str(attr.zig_version)
if attr.use_cc_common_link:
result["//zig/settings:use_cc_common_link"] = attr.use_cc_common_link
if attr.use_cc_common_link != -1:
result["//zig/settings:use_cc_common_link"] = attr.use_cc_common_link == 1
if attr.mode:
result["//zig/settings:mode"] = attr.mode
if attr.threaded:
Expand Down Expand Up @@ -159,9 +159,17 @@ def _make_attrs(*, executable):
doc = "The Zig SDK version, must be registered using the `zig` module extension.",
mandatory = False,
),
"use_cc_common_link": attr.bool(
doc = "Whether to use cc_common.link to link zig binaries, tests and shared libraries.",
"use_cc_common_link": attr.int(
doc = (
"Whether to use cc_common.link to link zig binaries, tests and shared libraries. " +
"Possible values: [-1, 0, 1]. " +
"-1 means use current configuration value for //zig/settings:experimental_use_cc_common_link. " +
"0 means do not use cc_common.link (use zig build-exe instead). " +
"1 means use cc_common.link."
),
mandatory = False,
values = [-1, 0, 1],
default = -1,
),
"mode": attr.string(
doc = "The build mode setting, corresponds to the `-O` Zig compiler flag.",
Expand Down
Loading