Skip to content

Commit

Permalink
Merge #116
Browse files Browse the repository at this point in the history
116: Use system default location for libzfs on illumos r=jmesmon a=nospam3089

Makes compilation successful and running `cargo run --example sync-hang` in zfs-core/ works.

No further testing done.

Co-authored-by: cos <cos>
  • Loading branch information
bors[bot] committed May 13, 2022
2 parents 2d9b97f + 4aacf41 commit ecd5a92
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions zfs-core-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ fn main() {
let lookup_with: Option<Lookup> = lookup_with.map(|v| v.to_str().unwrap().parse().unwrap());

lookup_with.unwrap_or_else(|| match target_os.as_str() {
// users have reported that this is required for freebsd. I have not tested it.
"freebsd" => Lookup::Link,
// Users have reported that this is required for freebsd and illumos. Not tested by
// Cody P Schafer.
"freebsd" | "illumos" => Lookup::Link,

// openzfs on osx has the `libzfs_core.pc` file, installed into
// `/usr/local/zfs/lib/pkgconfig`. Users _must_ ensure this is part of their
Expand Down

0 comments on commit ecd5a92

Please sign in to comment.