Skip to content

Commit c920182

Browse files
authored
curl-sys: remove Haiku cross-compilation workaround (#496)
Previously, there were issues cross-compiling the curl library from source on the Haiku platform. That meant that a workaround was added to `build.rs` to always link to the shared library in that case. When testing for the current build, this workaround is no longer necessary, as cross-compiling the curl-sys crate works as expected. This removes the workaround for this scenario, as it can now use the standard behavior.
1 parent 9ce02b6 commit c920182

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

curl-sys/build.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use std::process::Command;
55

66
fn main() {
77
println!("cargo:rerun-if-changed=curl");
8-
let host = env::var("HOST").unwrap();
98
let target = env::var("TARGET").unwrap();
109
let windows = target.contains("windows");
1110

@@ -20,13 +19,6 @@ fn main() {
2019
return println!("cargo:rustc-flags=-l curl");
2120
}
2221

23-
// When cross-compiling for Haiku, use the system's default supplied
24-
// libcurl (it supports http2). This is in the case where rustc and
25-
// cargo are built for Haiku, which is done from a Linux host.
26-
if host != target && target.contains("haiku") {
27-
return println!("cargo:rustc-flags=-l curl");
28-
}
29-
3022
// If the static-curl feature is disabled, probe for a system-wide libcurl.
3123
if !cfg!(feature = "static-curl") {
3224
// OSX ships libcurl by default, so we just use that version

0 commit comments

Comments
 (0)