bazel
/
rules_foreign_cc
mirror of https://github.com/bazel-contrib/rules_foreign_cc
2
0
Fork 0
Code Issues Releases Activity

Build make commands from correct attribute dict (#643) 

* build make commands from attrs, not ctx.attr

* do not replace all instances of make/ninja
This commit is contained in:
sam-lunt 2021-05-12 10:21:25 -05:00 committed by GitHub
parent cef5ee61ff
commit f9dc5ebb0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
foreign_cc/private/framework.bzl
View File

@ -337,7 +337,7 @@ def cc_external_rule_impl(ctx, attrs):
).items()
]
make_commands, build_tools = _generate_make_commands(ctx)
make_commands, build_tools = _generate_make_commands(ctx, attrs)
postfix_script = [attrs.postfix_script]
if not attrs.postfix_script:
@ -855,26 +855,32 @@ def _collect_libs(cc_linking):
libs.append(library)
return collections.uniq(libs)
def _generate_make_commands(ctx):
make_commands = getattr(ctx.attr, "make_commands", [])
def _generate_make_commands(ctx, attrs):
make_commands = getattr(attrs, "make_commands", [])
tools_deps = []
# Early out if there are no commands set
if not make_commands:
return make_commands, tools_deps
if _uses_tool(ctx.attr.make_commands, "make"):
if _uses_tool(attrs.make_commands, "make"):
make_data = get_make_data(ctx)
tools_deps += make_data.deps
make_commands = [command.replace("make", make_data.path) for command in make_commands]
make_commands = [_expand_command_path("make", make_data.path, command) for command in make_commands]
if _uses_tool(ctx.attr.make_commands, "ninja"):
if _uses_tool(attrs.make_commands, "ninja"):
ninja_data = get_ninja_data(ctx)
tools_deps += ninja_data.deps
make_commands = [command.replace("ninja", ninja_data.path) for command in make_commands]
make_commands = [_expand_command_path("ninja", ninja_data.path, command) for command in make_commands]
return make_commands, [tool.files for tool in tools_deps]
def _expand_command_path(binary, path, command):
if command == binary or command.startswith(binary + " "):
return command.replace(binary, path, 1)
else:
return command
def _uses_tool(make_commands, tool):
for command in make_commands:
(before, separator, after) = command.partition(" ")