-
-
Notifications
You must be signed in to change notification settings - Fork 786
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.
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
Check for the presence of CARGO_BUILD_TARGET_DIR env variable #5430
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
itkovian
force-pushed
the
cargo-env-target-build-dir
branch
from
May 16, 2024 21:17
4664b15
to
46782d6
Compare
When building in the presence of a CARGO_BUILD_TARGET_DIR, there is no target dir created inside the repo, so copying to a location within the local repo dir fails, hence we need to copy to the actual target dir that is being used.
itkovian
force-pushed
the
cargo-env-target-build-dir
branch
from
May 17, 2024 05:56
46782d6
to
cc9940d
Compare
wez
reviewed
Jun 8, 2024
wezterm-gui/build.rs
Outdated
@@ -168,7 +168,10 @@ END | |||
.join("WezTerm.app") | |||
.join("Contents") | |||
.join("Info.plist"); | |||
let dest_plist = repo_dir.join("target").join(profile).join("Info.plist"); | |||
let build_target_dir = std::env::var("CARGO_BUILD_TARGET_DIR") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be CARGO_TARGET_DIR
? When is CARGO_BUILD_TARGET_DIR
set?
https://doc.rust-lang.org/cargo/appendix/glossary.html?highlight=CARGO_TARGET_DIR#target
Thanks! |
saep
pushed a commit
to saep/wezterm
that referenced
this pull request
Jul 14, 2024
* feat: use CARGO_BUILD_TARGET_DIR env When building in the presence of a CARGO_BUILD_TARGET_DIR, there is no target dir created inside the repo, so copying to a location within the local repo dir fails, hence we need to copy to the actual target dir that is being used. * fix: environment variable with correct name
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When building in the presence of a CARGO_BUILD_TARGET_DIR, there is no target dir created inside the repo, so copying to a location within the local repo dir fails, hence we need to copy to the actual target dir that is being used.