Skip to content

Strip whitespace from paths before prefixing ${pwd} #4054

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
gergondet-woven wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −5
Open

Strip whitespace from paths before prefixing ${pwd} #4054

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
7 changes: 4 additions & 3 deletions cargo/private/cargo_build_script.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def _prefix_pwd_to_flag(args, flag_variations):

# Check for concatenated form (flag with path)
if arg.startswith(flag):
path = arg[len(flag):]
path = arg[len(flag):].strip()

# Don't prefix absolute paths
if paths.is_absolute(path):
Expand All @@ -208,8 +208,8 @@ def _prefix_pwd_to_flag(args, flag_variations):
break

# Check for space-separated form (only for flags without '=' or ':')
if not flag.endswith("=") and not flag.endswith(":") and prefix_next_arg and not paths.is_absolute(arg):
res.append("${{pwd}}/{}".format(arg))
if not flag.endswith("=") and not flag.endswith(":") and prefix_next_arg and not paths.is_absolute(arg.strip()):
res.append("${{pwd}}/{}".format(arg.strip()))
handled = True
break

Expand All @@ -233,6 +233,7 @@ def _prefix_pwd_to_paths(args):
"""
res = []
for path in args:
path = path.strip()
if not paths.is_absolute(path):
res.append("${{pwd}}/{}".format(path))
else:
Expand Down
4 changes: 2 additions & 2 deletions cargo/tests/cargo_build_script/cc_args_and_env/cc_args_and_env_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,8 @@ def include_relative_test(name):
cargo_build_script_with_extra_cc_compile_flags(
name = "%s/cargo_build_script" % name,
extra_include_paths = select({
"@platforms//os:windows": "test/relative/include;another/relative/path",
"//conditions:default": "test/relative/include:another/relative/path",
"@platforms//os:windows": "test/relative/include; another/relative/path",
"//conditions:default": "test/relative/include: another/relative/path",
}),
)
cc_args_and_env_analysis_test(
Expand Down