gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set rustc-cfg=cuda explicitly, also code cleanup

Browse Source
This commit is contained in:
Michael Vines
2019-06-17 09:48:26 -07:00
parent 735dfab02e
commit 97a136ea20
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/build.rs
View File

@@ -5,6 +5,9 @@ use std::path::Path;
fn main() { fn main() {
println!("cargo:rerun-if-changed=build.rs"); println!("cargo:rerun-if-changed=build.rs");
if env::var("CARGO_FEATURE_CUDA").is_ok() {
println!("cargo:rustc-cfg=cuda");
let perf_libs_dir = { let perf_libs_dir = {
let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap(); let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
let mut path = Path::new(&manifest_dir); let mut path = Path::new(&manifest_dir);
@@ -13,9 +16,6 @@ fn main() {
}; };
let perf_libs_dir = perf_libs_dir.to_str().unwrap(); let perf_libs_dir = perf_libs_dir.to_str().unwrap();
let cuda = !env::var("CARGO_FEATURE_CUDA").is_err();
if cuda {
// Ensure `perf_libs_dir` exists. It's been observed that // Ensure `perf_libs_dir` exists. It's been observed that
// a cargo:rerun-if-changed= directive with a non-existent // a cargo:rerun-if-changed= directive with a non-existent
// directory triggers a rebuild on every |cargo build| invocation // directory triggers a rebuild on every |cargo build| invocation
@@ -24,18 +24,15 @@ fn main() {
panic!("Unable to create {}: {:?}", perf_libs_dir, err); panic!("Unable to create {}: {:?}", perf_libs_dir, err);
} }
}); });
println!("cargo:rerun-if-changed={}", perf_libs_dir); println!("cargo:rerun-if-changed={}", perf_libs_dir);
println!("cargo:rustc-link-search=native={}", perf_libs_dir); println!("cargo:rustc-link-search=native={}", perf_libs_dir);
} println!("cargo:rerun-if-changed={}/libcuda-crypt.a", perf_libs_dir);
if cuda { println!("cargo:rustc-link-lib=static=cuda-crypt");
let cuda_home = match env::var("CUDA_HOME") { let cuda_home = match env::var("CUDA_HOME") {
Ok(cuda_home) => cuda_home, Ok(cuda_home) => cuda_home,
Err(_) => String::from("/usr/local/cuda"), Err(_) => String::from("/usr/local/cuda"),
}; };
println!("cargo:rerun-if-changed={}/libcuda-crypt.a", perf_libs_dir);
println!("cargo:rustc-link-lib=static=cuda-crypt");
println!("cargo:rustc-link-search=native={}/lib64", cuda_home); println!("cargo:rustc-link-search=native={}/lib64", cuda_home);
println!("cargo:rustc-link-lib=dylib=cudart"); println!("cargo:rustc-link-lib=dylib=cudart");
println!("cargo:rustc-link-lib=dylib=cuda"); println!("cargo:rustc-link-lib=dylib=cuda");