Skip to content

Commit cdf9ee9

Browse files
committed
revert #170
This caused fairly widespread problems and it seems that the original issue that led to this change (rust-lang/rust#69552) should really be fixed by better defining the data exported from eg: libz-sys rather than having downstream crates replicating the same logic from inside that crate. refs: #174 refs: #170 refs: #169 refs: rust-lang/rust#69552
1 parent 9391b90 commit cdf9ee9

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

libssh2-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "libssh2-sys"
3-
version = "0.2.16"
3+
version = "0.2.17"
44
authors = ["Alex Crichton <[email protected]>", "Wez Furlong <[email protected]>"]
55
links = "ssh2"
66
build = "build.rs"

libssh2-sys/build.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,6 @@ fn main() {
124124
println!("cargo:rerun-if-env-changed=DEP_Z_INCLUDE");
125125
if let Some(path) = env::var_os("DEP_Z_INCLUDE") {
126126
cfg.include(path);
127-
} else if let Ok(lib) = pkg_config::find_library("zlib") {
128-
for path in &lib.include_paths {
129-
cfg.include(path);
130-
}
131127
}
132128

133129
println!("cargo:rerun-if-env-changed=DEP_OPENSSL_INCLUDE");
@@ -139,10 +135,6 @@ fn main() {
139135
}
140136
}
141137
}
142-
} else if let Ok(lib) = pkg_config::find_library("openssl") {
143-
for path in &lib.include_paths {
144-
cfg.include(path);
145-
}
146138
}
147139

148140
let libssh2h = fs::read_to_string("libssh2/include/libssh2.h").unwrap();

0 commit comments

Comments
 (0)