Skip to content

meson: add missing tool paths #1447

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

Open
matt-sm wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −0
Open

meson: add missing tool paths #1447

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
4 changes: 4 additions & 0 deletions foreign_cc/meson.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ def _create_meson_script(configureParameters):
script.append("##export_var## CC {}".format(_absolutize(ctx.workspace_name, tools.cc)))
if " " not in tools.cxx:
script.append("##export_var## CXX {}".format(_absolutize(ctx.workspace_name, tools.cxx)))
if " " not in tools.cxx_linker_static and tools.cxx_linker_static.endswith("ar"):
script.append("##export_var## AR {}".format(_absolutize(ctx.workspace_name, tools.cxx_linker_static)))
if tools.strip and " " not in tools.strip:
script.append("##export_var## STRIP {}".format(_absolutize(ctx.workspace_name, tools.strip)))

copts = flags.cc
cxxopts = flags.cxx
Expand Down
15 changes: 15 additions & 0 deletions foreign_cc/private/cc_toolchain_util.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ CxxToolsInfo = provider(
cxx_linker_static = "C++ linker to link static library",
cxx_linker_executable = "C++ linker to link executable",
ld = "linker",
strip = "strip",
),
)

Expand Down Expand Up @@ -194,13 +195,26 @@ def get_tools_info(ctx):

Args:
ctx: rule context

Returns:
CxxToolsInfo
"""
cc_toolchain = find_cpp_toolchain(ctx)
feature_configuration = _configure_features(
ctx = ctx,
cc_toolchain = cc_toolchain,
)

strip = ""
if cc_common.action_is_enabled(
feature_configuration = feature_configuration,
action_name = ACTION_NAMES.strip,
):
strip = cc_common.get_tool_for_action(
feature_configuration = feature_configuration,
action_name = ACTION_NAMES.strip,
)

return CxxToolsInfo(
cc = cc_common.get_tool_for_action(
feature_configuration = feature_configuration,
Expand All @@ -219,6 +233,7 @@ def get_tools_info(ctx):
action_name = ACTION_NAMES.cpp_link_executable,
),
ld = cc_toolchain.ld_executable,
strip = strip,
)

def get_flags_info(ctx, link_output_file = None):
Expand Down