aboutsummaryrefslogtreecommitdiff
path: root/ctr-std/src
diff options
context:
space:
mode:
authorFenrir <[email protected]>2018-02-11 15:08:01 -0700
committerFenrirWolf <[email protected]>2018-02-11 15:20:46 -0700
commitdcccdcc09022605a978eec0a239c6a24569bbd46 (patch)
tree7bf5fc916cadfc93c2dc854b77b52f7d8506995e /ctr-std/src
parentUpdate travis config (diff)
downloadctru-rs-dcccdcc09022605a978eec0a239c6a24569bbd46.tar.xz
ctru-rs-dcccdcc09022605a978eec0a239c6a24569bbd46.zip
Filter out glibc symbols
we're not glibc and these caused a linker error when building `std` in debug mode
Diffstat (limited to 'ctr-std/src')
-rw-r--r--ctr-std/src/sys/unix/net.rs1
-rw-r--r--ctr-std/src/sys_common/net.rs4
2 files changed, 3 insertions, 2 deletions
diff --git a/ctr-std/src/sys/unix/net.rs b/ctr-std/src/sys/unix/net.rs
index b9b1a39..8a17786 100644
--- a/ctr-std/src/sys/unix/net.rs
+++ b/ctr-std/src/sys/unix/net.rs
@@ -361,6 +361,7 @@ impl IntoInner<c_int> for Socket {
// res_init unconditionally, we call it only when we detect we're linking
// against glibc version < 2.26. (That is, when we both know its needed and
// believe it's thread-safe).
+#[cfg(target_env = "gnu")]
pub fn res_init_if_glibc_before_2_26() -> io::Result<()> {
// If the version fails to parse, we treat it the same as "not glibc".
if let Some(Ok(version_str)) = glibc_version_cstr().map(CStr::to_str) {
diff --git a/ctr-std/src/sys_common/net.rs b/ctr-std/src/sys_common/net.rs
index 6223f82..c81c7e6 100644
--- a/ctr-std/src/sys_common/net.rs
+++ b/ctr-std/src/sys_common/net.rs
@@ -154,7 +154,7 @@ pub fn lookup_host(host: &str) -> io::Result<LookupHost> {
Ok(_) => {
Ok(LookupHost { original: res, cur: res })
},
- #[cfg(unix)]
+ #[cfg(target_env = "gnu")]
Err(e) => {
// If we're running glibc prior to version 2.26, the lookup
// failure could be caused by caching a stale /etc/resolv.conf.
@@ -168,7 +168,7 @@ pub fn lookup_host(host: &str) -> io::Result<LookupHost> {
Err(e)
},
// the cfg is needed here to avoid an "unreachable pattern" warning
- #[cfg(not(unix))]
+ #[cfg(not(target_env = "gnu"))]
Err(e) => Err(e),
}
}