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

Jump to bottom

Fix minor build.rs issues w.r.t. custom libfuzzer paths #103

Merged
merged 3 commits into from
Jan 26, 2023
Merged

Fix minor build.rs issues w.r.t. custom libfuzzer paths #103

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a7f78d
fix some minor build.rs issues
addisoncrump Jan 3, 2023
f47576d
fmt
addisoncrump Jan 3, 2023
663c0b6
rerun if the targeted library is also changed, not just if the path does
addisoncrump Jan 25, 2023
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: 6 additions & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
fn main() {
println!("cargo:rerun-if-env-changed=CUSTOM_LIBFUZZER_PATH");
if let Ok(custom) = ::std::env::var("CUSTOM_LIBFUZZER_PATH") {
println!("cargo:rerun-if-changed={custom}");

let custom_lib_path = ::std::path::PathBuf::from(&custom);
Copy link

Choose a reason for hiding this comment

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

Adding a println!("cargo:rerun-if-changed={custom}"); here might be useful :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fair point -- added!

let custom_lib_dir = custom_lib_path.parent().unwrap().to_string_lossy();

let custom_lib_name = custom_lib_path.file_stem().unwrap().to_string_lossy();
let custom_lib_name = custom_lib_name.trim_start_matches("lib");
let custom_lib_name = custom_lib_name
.strip_prefix("lib")
.unwrap_or(custom_lib_name.as_ref());

println!("cargo:rustc-link-search=native={}", custom_lib_dir);
println!("cargo:rustc-link-lib=static={}", custom_lib_name);
Expand Down