Skip to content

Add support for ${pwd} for -L, -resource-dir and INCLUDE env var#3832

Merged
illicitonion merged 2 commits intobazelbuild:mainfrom
ArchangelX360:ArchangelX360/fix_pwd
Mar 5, 2026
Merged

Add support for ${pwd} for -L, -resource-dir and INCLUDE env var#3832
illicitonion merged 2 commits intobazelbuild:mainfrom
ArchangelX360:ArchangelX360/fix_pwd

Conversation

@ArchangelX360
Copy link
Contributor

No description provided.

@google-cla
Copy link

google-cla bot commented Feb 1, 2026

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@ArchangelX360 ArchangelX360 force-pushed the ArchangelX360/fix_pwd branch 2 times, most recently from c6299e7 to 96bc9e9 Compare February 1, 2026 19:31
@ArchangelX360 ArchangelX360 changed the title Add support for ${pwd} for -L, -B, -resource-dir and INCLUDE env var Add support for ${pwd} for -L, -resource-dir and INCLUDE env var Feb 1, 2026
@illicitonion
Copy link
Collaborator

This looks good, thanks! Please could you expand the tests in test/cargo_build_script/cc_args_and_env/cc_args_and_env_test.bzl to cover these extra args?

@ArchangelX360
Copy link
Contributor Author

@illicitonion Added tests for both commits, and fixed a couple of bugs. I also merged both logic (equal vs. rest) now given I needed to reason about equal signed variant.

@ArchangelX360
Copy link
Contributor Author

Anything blocking that to be merged?

@keith
Copy link
Member

keith commented Mar 4, 2026

I just hit this with -resource-dir and verified this patch fixes my case too

Copy link
Collaborator

@illicitonion illicitonion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay here, it's been a busy few weeks! This LGTM, thanks so much for the tests (and fixes), this looks great!

@illicitonion illicitonion added this pull request to the merge queue Mar 5, 2026
Merged via the queue into bazelbuild:main with commit 0a42851 Mar 5, 2026
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants