Skip to content

Use CARGO_MANIFEST_DIR from buildscript run time #2258

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

Open
dtolnay wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

Use CARGO_MANIFEST_DIR from buildscript run time #2258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions libsql-ffi/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ fn main() {
"bundled/bindings/bindgen.rs"
};

let dir = env!("CARGO_MANIFEST_DIR");
let dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());

let full_src_path = Path::new(dir).join(bindgen_rs_path);
let full_src_path = dir.join(bindgen_rs_path);
copy_with_cp(full_src_path, &out_path).unwrap();

println!("cargo:lib_dir={out_dir}");
Expand Down Expand Up @@ -192,8 +192,8 @@ pub fn build_bundled(out_dir: &str, out_path: &Path) {
bindings::write_to_out_dir(header, bindgen_rs_path.as_ref());
}

let dir = env!("CARGO_MANIFEST_DIR");
copy_with_cp(format!("{dir}/{bindgen_rs_path}"), out_path).unwrap();
let dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
copy_with_cp(dir.join(bindgen_rs_path), out_path).unwrap();

let mut cfg = cc::Build::new();
cfg.flag("-std=c11")
Expand Down Expand Up @@ -453,8 +453,8 @@ fn build_multiple_ciphers(out_path: &Path) -> PathBuf {
bindings::write_to_out_dir(header, bindgen_rs_path.as_ref());
}

let dir = env!("CARGO_MANIFEST_DIR");
copy_with_cp(format!("{dir}/{bindgen_rs_path}"), out_path).unwrap();
let dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
copy_with_cp(dir.join(bindgen_rs_path), out_path).unwrap();

let out_dir = env::var("OUT_DIR").unwrap();

Expand Down
Loading