carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 19:30:12 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix bazel-bin invocations of run_tool (#4521)

Browse Source 
SCRIPT_LOCATION contains `bazel-out`, so this drops the portions shared
between the script and tool locations before removing the suffix.
This commit is contained in:
Jon Ross-Perkins
2024-11-13 18:16:49 +00:00
committed by GitHub
parent f17939e252
commit 5e293ad97f
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/install/run_tool.bzl
+13 -3
View File
@@ -13,16 +13,26 @@ import sys
_SCRIPT_LOCATION = "{0}"
_TOOL_LOCATION = "{1}"
# Drop shared parent portions so that we're working with a minimum suffix.
# This is so that both `bazel-out` and manual `bazel-bin` invocations work.
script_parts = _SCRIPT_LOCATION.split('/')
tool_parts = _TOOL_LOCATION.split('/')
while script_parts and tool_parts and script_parts[0] == tool_parts[0]:
del script_parts[0]
del tool_parts[0]
script_suffix = '/' + '/'.join(script_parts)
tool_suffix = '/' + '/'.join(tool_parts)
# Make sure we have the expected structure.
if not __file__.endswith(_SCRIPT_LOCATION):
if not __file__.endswith(script_suffix):
exit(
"Unable to figure out path:\\n"
f" __file__: {{__file__}}\\n"
f" script: {{_SCRIPT_LOCATION}}\\n"
f" script: {{script_suffix}}\\n"
)
# Run the tool using the absolute path, forwarding arguments.
tool_path = __file__.removesuffix(_SCRIPT_LOCATION) + _TOOL_LOCATION
tool_path = __file__.removesuffix(script_suffix) + tool_suffix
os.execv(tool_path, [tool_path] + sys.argv[1:])
"""