Skip to content
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

Check for the presence of CARGO_BUILD_TARGET_DIR env variable #5430

Merged
merged 5 commits into from
Jun 17, 2024
Merged

Check for the presence of CARGO_BUILD_TARGET_DIR env variable #5430

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc9940d
feat: use CARGO_BUILD_TARGET_DIR env
itkovian May 16, 2024
5315fb2
Merge branch 'main' into cargo-env-target-build-dir
itkovian Jun 3, 2024
aa41219
Merge branch 'main' into cargo-env-target-build-dir
itkovian Jun 6, 2024
855896d
fix: environment variable with correct name
itkovian Jun 17, 2024
c41523a
Merge branch 'main' into cargo-env-target-build-dir
itkovian Jun 17, 2024
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
5 changes: 4 additions & 1 deletion wezterm-gui/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Owner

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

.and_then(|s| Ok(std::path::PathBuf::from(s)))
.unwrap_or(repo_dir.join("target").join(profile));
let dest_plist = build_target_dir.join("Info.plist");
println!("cargo:rerun-if-changed=assets/macos/WezTerm.app/Contents/Info.plist");

std::fs::copy(&src_plist, &dest_plist)
Expand Down