From 013dc85328e11fa0836d653ed8741c84bf1d843f Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Mon, 22 Mar 2021 14:04:34 +0100 Subject: [PATCH] download to out_dir --- fuzzers/libfuzzer_libmozjpeg/build.rs | 4 ++-- fuzzers/libfuzzer_libpng_cmpalloc/build.rs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fuzzers/libfuzzer_libmozjpeg/build.rs b/fuzzers/libfuzzer_libmozjpeg/build.rs index 96f09a9db0..a3ced5b2bb 100644 --- a/fuzzers/libfuzzer_libmozjpeg/build.rs +++ b/fuzzers/libfuzzer_libmozjpeg/build.rs @@ -15,7 +15,7 @@ fn main() { } let out_dir = env::var_os("OUT_DIR").unwrap(); - let cwd = env::current_dir().unwrap().to_string_lossy().to_string(); + //let cwd = env::current_dir().unwrap().to_string_lossy().to_string(); let out_dir = out_dir.to_string_lossy().to_string(); let out_dir_path = Path::new(&out_dir); @@ -24,7 +24,7 @@ fn main() { let libmozjpeg = format!("{}/mozjpeg-4.0.3", &out_dir); let libmozjpeg_path = Path::new(&libmozjpeg); - let libmozjpeg_tar = format!("{}/v4.0.3.tar.gz", &cwd); + let libmozjpeg_tar = format!("{}/v4.0.3.tar.gz", &out_dir); // Enforce clang for its -fsanitize-coverage support. std::env::set_var("CC", "clang"); diff --git a/fuzzers/libfuzzer_libpng_cmpalloc/build.rs b/fuzzers/libfuzzer_libpng_cmpalloc/build.rs index 49f3cfba94..45dcf2ce58 100644 --- a/fuzzers/libfuzzer_libpng_cmpalloc/build.rs +++ b/fuzzers/libfuzzer_libpng_cmpalloc/build.rs @@ -16,7 +16,6 @@ fn main() { } let out_dir = env::var_os("OUT_DIR").unwrap(); - let cwd = env::current_dir().unwrap().to_string_lossy().to_string(); let out_dir = out_dir.to_string_lossy().to_string(); let out_dir_path = Path::new(&out_dir); @@ -25,7 +24,7 @@ fn main() { let libpng = format!("{}/libpng-1.6.37", &out_dir); let libpng_path = Path::new(&libpng); - let libpng_tar = format!("{}/libpng-1.6.37.tar.xz", &cwd); + let libpng_tar = format!("{}/libpng-1.6.37.tar.xz", &out_dir); // Enforce clang for its -fsanitize-coverage support. std::env::set_var("CC", "clang");