From 3dfd28586afcf9c35708a957ce9e02d4bcf18f8a Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@v.igoro.us>
Date: Thu, 7 Jul 2022 00:08:31 +0000
Subject: [PATCH] fix linking for taskchampion-integration-tests

---
 rust/integration-tests/build.rs | 3 ++-
 rust/lib/Cargo.toml             | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rust/integration-tests/build.rs b/rust/integration-tests/build.rs
index face5701d..0907f3d1b 100644
--- a/rust/integration-tests/build.rs
+++ b/rust/integration-tests/build.rs
@@ -12,13 +12,14 @@ fn link_libtaskchampion() {
     // Shared libraries (crate-type=cdylib) appear to be placed in target/$PROFILE/deps.
     let mut libtc_dir = env::current_dir().unwrap();
     libtc_dir.pop();
+    libtc_dir.pop();
     libtc_dir.push("target");
     libtc_dir.push(env::var("PROFILE").unwrap());
     libtc_dir.push("deps");
 
     let libtc_dir = libtc_dir.to_str().expect("path is valid utf-8");
     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
     if cfg!(target_os = "windows") {
diff --git a/rust/lib/Cargo.toml b/rust/lib/Cargo.toml
index f330ba89b..f7405cc30 100644
--- a/rust/lib/Cargo.toml
+++ b/rust/lib/Cargo.toml
@@ -3,9 +3,9 @@ name = "taskchampion-lib"
 version = "0.1.0"
 edition = "2018"
 
-#[lib]
-#name = "taskchampionlib"
-#crate-type = ["staticlib", "cdylib", "rlib"]
+[lib]
+# staticlib is used for integration-tests, and is not exported.
+crate-type = ["cdylib", "lib"]
 
 [dependencies]
 libc = "0.2.126"