GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix linking for taskchampion-integration-tests

Browse source
This commit is contained in:
Dustin J. Mitchell 2022-07-07 00:08:31 +00:00 • committed by Tomas Babej
parent 6a42cf00a2
commit 3dfd28586a
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rust/integration-tests/build.rs
View file

@ -12,13 +12,14 @@ fn link_libtaskchampion() {
// Shared libraries (crate-type=cdylib) appear to be placed in target/$PROFILE/deps. // Shared libraries (crate-type=cdylib) appear to be placed in target/$PROFILE/deps.
let mut libtc_dir = env::current_dir().unwrap(); let mut libtc_dir = env::current_dir().unwrap();
libtc_dir.pop(); libtc_dir.pop();
libtc_dir.pop();
libtc_dir.push("target"); libtc_dir.push("target");
libtc_dir.push(env::var("PROFILE").unwrap()); libtc_dir.push(env::var("PROFILE").unwrap());
libtc_dir.push("deps"); libtc_dir.push("deps");
let libtc_dir = libtc_dir.to_str().expect("path is valid utf-8"); let libtc_dir = libtc_dir.to_str().expect("path is valid utf-8");
println!("cargo:rustc-link-search={}", libtc_dir); println!("cargo:rustc-link-search={}", libtc_dir);
println!("cargo:rustc-link-lib=dylib=taskchampionlib"); println!("cargo:rustc-link-lib=dylib=taskchampion_lib");
// on windows, it appears that rust std requires BCrypt // on windows, it appears that rust std requires BCrypt
if cfg!(target_os = "windows") { if cfg!(target_os = "windows") {

6
rust/lib/Cargo.toml
View file

@ -3,9 +3,9 @@ name = "taskchampion-lib"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2018"
#[lib] [lib]
#name = "taskchampionlib" # staticlib is used for integration-tests, and is not exported.
#crate-type = ["staticlib", "cdylib", "rlib"] crate-type = ["cdylib", "lib"]
[dependencies] [dependencies]
libc = "0.2.126" libc = "0.2.126"