Skip to content

Commit 2cf93ac

Browse files
authored
Rollup merge of rust-lang#122730 - ferrocene:hoverbear/qnx-ucred-cfgs, r=Amanieu
Expose `ucred::peer_cred` on QNX targets to enable dist builds After following https://doc.rust-lang.org/rustc/platform-support/nto-qnx.html I attempted to run the following `x.py` command: ```bash export build_env=' CC_aarch64-unknown-nto-qnx710=qcc CFLAGS_aarch64-unknown-nto-qnx710=-Vgcc_ntoaarch64le_cxx CXX_aarch64-unknown-nto-qnx710=qcc AR_aarch64_unknown_nto_qnx710=ntoaarch64-ar CC_x86_64-pc-nto-qnx710=qcc CFLAGS_x86_64-pc-nto-qnx710=-Vgcc_ntox86_64_cxx CXX_x86_64-pc-nto-qnx710=qcc AR_x86_64_pc_nto_qnx710=ntox86_64-ar' env $build_env ./x.py --stage 2 dist rust-std --target aarch64-unknown-nto-qnx710,x86_64-pc-nto-qnx710,x86_64-unknown-linux-gnu ``` The result was the following error: ``` Compiling object v0.32.2 Compiling std_detect v0.1.5 (/home/ana/git/rust-lang/rust/library/stdarch/crates/std_detect) Compiling addr2line v0.21.0 error: function `peer_cred` is never used --> library/std/src/os/unix/net/ucred.rs:89:12 | 89 | pub fn peer_cred(socket: &UnixStream) -> io::Result<UCred> { | ^^^^^^^^^ | = note: `-D dead-code` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(dead_code)]` error: could not compile `std` (lib) due to 1 previous error Build completed unsuccessfully in 0:06:25 ``` I contacted `@flba-eb` and `@gh-tr` over email and we confirmed that `peer_cred` here should be flagged on `nto` targets. This should enable the clean `x.py --stage 2 dist rust-std` command on these platforms.
2 parents 9fb40ef + d82d419 commit 2cf93ac

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

library/std/src/os/unix/net/stream.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
target_os = "macos",
99
target_os = "watchos",
1010
target_os = "netbsd",
11-
target_os = "openbsd"
11+
target_os = "openbsd",
12+
target_os = "nto"
1213
))]
1314
use super::{peer_cred, UCred};
1415
#[cfg(any(doc, target_os = "android", target_os = "linux"))]
@@ -234,7 +235,8 @@ impl UnixStream {
234235
target_os = "macos",
235236
target_os = "watchos",
236237
target_os = "netbsd",
237-
target_os = "openbsd"
238+
target_os = "openbsd",
239+
target_os = "nto"
238240
))]
239241
pub fn peer_cred(&self) -> io::Result<UCred> {
240242
peer_cred(self)

library/std/src/os/unix/net/ucred.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ pub(super) use self::impl_linux::peer_cred;
3030
target_os = "dragonfly",
3131
target_os = "freebsd",
3232
target_os = "openbsd",
33-
target_os = "netbsd"
33+
target_os = "netbsd",
34+
target_os = "nto"
3435
))]
3536
pub(super) use self::impl_bsd::peer_cred;
3637

0 commit comments

Comments
 (0)