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

Fix tool path for nmake (#1165)

This commit is contained in:
John Sun 2024-01-26 10:27:52 +11:00 committed by GitHub
parent c2e097455d
commit c5d7942243
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
foreign_cc/private/make_env_vars.bzl
View File

@ -10,8 +10,9 @@ def get_make_env_vars(
flags, flags,
user_vars, user_vars,
deps, deps,
inputs): inputs,
vars = _get_make_variables(workspace_name, tools, flags, user_vars) make_commands = []):
vars = _get_make_variables(workspace_name, tools, flags, user_vars, make_commands)
deps_flags = _define_deps_flags(deps, inputs) deps_flags = _define_deps_flags(deps, inputs)
# For cross-compilation. # For cross-compilation.
@ -94,7 +95,7 @@ _MAKE_TOOLS = {
# missing: cxx_linker_executable # missing: cxx_linker_executable
} }
def _get_make_variables(workspace_name, tools, flags, user_env_vars): def _get_make_variables(workspace_name, tools, flags, user_env_vars, make_commands):
vars = {} vars = {}
for flag in _MAKE_FLAGS: for flag in _MAKE_FLAGS:
@ -115,9 +116,12 @@ def _get_make_variables(workspace_name, tools, flags, user_env_vars):
# Force absolutize of tool paths, which may relative to the exec root (e.g. hermetic toolchains built from source) # Force absolutize of tool paths, which may relative to the exec root (e.g. hermetic toolchains built from source)
tool_value_absolute = _absolutize(workspace_name, tool_value, True) tool_value_absolute = _absolutize(workspace_name, tool_value, True)
# If the tool path contains whitespaces (e.g. C:\Program Files\...), # There are 2 conditions where we need to wrap the tool path in double quotes:
# MSYS2 requires that the path is wrapped in double quotes # 1. If the tool path contains whitespaces (e.g. C:\Program Files\...),
if " " in tool_value_absolute: # MSYS2 requires that the path is wrapped in double quotes.
# 2. If nmake is used, it requires the tool path to be wrapped in double quotes,
# otherwise nmake will output the command as a string instead of executing it.
if " " in tool_value_absolute or _nmake_in_make_commands(make_commands):
tool_value_absolute = "\\\"" + tool_value_absolute + "\\\"" tool_value_absolute = "\\\"" + tool_value_absolute + "\\\""
tools_dict[tool] = [tool_value_absolute] tools_dict[tool] = [tool_value_absolute]
@ -140,3 +144,6 @@ def _absolutize(workspace_name, text, force = False):
def _join_flags_list(workspace_name, flags): def _join_flags_list(workspace_name, flags):
return " ".join([_absolutize(workspace_name, flag) for flag in flags]) return " ".join([_absolutize(workspace_name, flag) for flag in flags])
def _nmake_in_make_commands(make_commands):
return make_commands and "nmake.exe" in make_commands[0]

2
foreign_cc/private/make_script.bzl
View File

@ -19,7 +19,7 @@ def create_make_script(
script.append("##symlink_contents_to_dir## $$EXT_BUILD_ROOT$$/{} $$BUILD_TMPDIR$$ False".format(root)) script.append("##symlink_contents_to_dir## $$EXT_BUILD_ROOT$$/{} $$BUILD_TMPDIR$$ False".format(root))
script.append("##enable_tracing##") script.append("##enable_tracing##")
configure_vars = get_make_env_vars(workspace_name, tools, flags, env_vars, deps, inputs) configure_vars = get_make_env_vars(workspace_name, tools, flags, env_vars, deps, inputs, make_commands)
script.extend(["{env_vars} {command}".format( script.extend(["{env_vars} {command}".format(
env_vars = configure_vars, env_vars = configure_vars,
command = command, command = command,