Change environment variable to point to library directory

Author: NlightNFotis

.github/workflows/pull-request-check-rust-api.yaml

@@ -64,7 +64,7 @@ jobs:
           VERSION=$(ruby -ne 'puts $~.captures if /^CBMC_VERSION\ =\ (\d+.\d+.\d+)$/' src/config.inc)
           cd src/libcprover-rust;\
           cargo clean;\
-          CBMC_BUILD_DIR=../../${{env.default_build_dir}} CBMC_VERSION=$VERSION cargo test -- --test-threads=1
+          CBMC_LIB_DIR=../../${{env.default_build_dir}}/lib CBMC_VERSION=$VERSION cargo test -- --test-threads=1
 
 
   check-macos-12-cmake-clang-rust:
@@ -104,4 +104,4 @@ jobs:
           VERSION=$(ruby -ne 'puts $~.captures if /^CBMC_VERSION\ =\ (\d+.\d+.\d+)$/' src/config.inc)
           cd src/libcprover-rust;\
           cargo clean;\
-          CBMC_BUILD_DIR=../../${{env.default_build_dir}} CBMC_VERSION=$VERSION cargo test -- --test-threads=1
+          CBMC_LIB_DIR=../../${{env.default_build_dir}}/lib CBMC_VERSION=$VERSION cargo test -- --test-threads=1

CMakeLists.txt

@@ -275,7 +275,7 @@ else()
 
     corrosion_import_crate(MANIFEST_PATH src/libcprover-rust/Cargo.toml)
     list(JOIN sat_impl " " sat_impl_str)
-    corrosion_set_env_vars(cprover-api-rust CBMC_BUILD_DIR=${CMAKE_BINARY_DIR} CBMC_VERSION=${CBMC_VERSION})
+    corrosion_set_env_vars(cprover-api-rust CBMC_LIB_DIR=${CMAKE_BINARY_DIR} CBMC_VERSION=${CBMC_VERSION})
     corrosion_link_libraries(cprover-api-rust cprover-api-cpp)
     install(TARGETS cprover-api-rust RUNTIME DESTINATION lib)
     # NOTE: We want to rename to a name consistent with the name of the

src/libcprover-rust/build.rs

@@ -8,8 +8,8 @@ fn get_current_working_dir() -> std::io::Result<PathBuf> {
     env::current_dir()
 }
 
-fn get_build_directory() -> Result<String, VarError> {
-    env::var("CBMC_BUILD_DIR")
+fn get_lib_directory() -> Result<String, VarError> {
+    env::var("CBMC_LIB_DIR")
 }
 
 // Passed by the top-level CMakeLists.txt to control which version of the
@@ -20,16 +20,15 @@ fn get_cbmc_version() -> Result<String, VarError> {
 }
 
 fn get_library_build_dir() -> std::io::Result<PathBuf> {
-    let env_var_fetch_result = get_build_directory();
+    let env_var_fetch_result = get_lib_directory();
     if let Ok(build_dir) = env_var_fetch_result {
         let mut path = PathBuf::new();
         path.push(build_dir);
-        path.push("lib/");
         return Ok(path);
     }
     Err(Error::new(
         ErrorKind::Other,
-        "failed to get build output directory",
+        "Please set the environment variable CBMC_LIB_DIR with the path that contains the libcprover.x.y.z.a library on your system",
     ))
 }