Skip to content

fix pkgconfig on windows #1459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
novas0x2a merged 1 commit into from
Feb 6, 2026
+4 −4
Merged

fix pkgconfig on windows #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 foreign_cc/built_tools/pkgconfig_build.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,10 @@ def pkgconfig_tool(name, srcs, **kwargs):
args = [
"-f Makefile.vc",
"CFG=release",
"GLIB_PREFIX=\"$$EXT_BUILD_ROOT/external/glib_dev\"",
"GLIB_PREFIX=\"$$EXT_BUILD_ROOT/external/%s\"" % Label("@glib_dev").workspace_name,
],
out_binaries = ["pkg-config.exe"],
env = {"INCLUDE": "$$EXT_BUILD_ROOT/external/glib_src"},
env = {"INCLUDE": "$$EXT_BUILD_ROOT/external/%s" % Label("@glib_src").workspace_name},
out_static_libs = [],
out_shared_libs = [],
deps = [
Expand All @@ -175,7 +175,7 @@ def pkgconfig_tool(name, srcs, **kwargs):
"@platforms//os:windows": "cp release/x64/pkg-config.exe $$INSTALLDIR/bin",
"//conditions:default": "",
}),
toolchain = str(Label("//toolchains:preinstalled_nmake_toolchain")),
toolchain = Label("//toolchains:preinstalled_nmake_toolchain"),
tags = tags,
**kwargs
)
Expand Down
2 changes: 1 addition & 1 deletion foreign_cc/private/transitions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ extra_toolchains_transitioned_foreign_cc_target = rule(
cfg = _extra_toolchains_transition,
attrs = {
# This attr is singular to make it selectable when used for add make toolchain variant.
"extra_toolchain": attr.string(
"extra_toolchain": attr.label(
doc = "Additional toolchain to consider. Note, this is singular.",
mandatory = True,
),
Expand Down