Skip to content

Commit 372d67a

Browse files
authored
Merge pull request #561 from AsbjornOlling/fix-build-on-nixos
build.rs: also search for library files in lib64/
2 parents c936083 + d9475cc commit 372d67a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

llama-cpp-sys-2/build.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fn extract_lib_names(out_dir: &Path, build_shared_libs: bool) -> Vec<String> {
6565
"*.a"
6666
}
6767
};
68-
let libs_dir = out_dir.join("lib");
68+
let libs_dir = out_dir.join("lib*");
6969
let pattern = libs_dir.join(lib_pattern);
7070
debug_log!("Extract libs {}", pattern.display());
7171

@@ -265,11 +265,13 @@ fn main() {
265265

266266
// Search paths
267267
println!("cargo:rustc-link-search={}", out_dir.join("lib").display());
268+
println!("cargo:rustc-link-search={}", out_dir.join("lib64").display());
268269
println!("cargo:rustc-link-search={}", build_dir.display());
269270

270271
// Link libraries
271272
let llama_libs_kind = if build_shared_libs { "dylib" } else { "static" };
272273
let llama_libs = extract_lib_names(&out_dir, build_shared_libs);
274+
assert_ne!(llama_libs.len(), 0);
273275

274276
for lib in llama_libs {
275277
debug_log!(
@@ -349,4 +351,4 @@ fn main() {
349351
}
350352
}
351353
}
352-
}
354+
}

0 commit comments

Comments
 (0)