about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-02-25 14:14:41 +0100
committerGitHub <noreply@github.com>2022-02-25 14:14:41 +0100
commit60606456d3b5cd4baf68f18191b0cfca57d9c85c (patch)
tree6df099c5ed9666ada9a553b505a8b152a35ef6cd
parent731cd3fbeb0e08a44d52c14039fe942c74491f0d (diff)
parent355d503acee3489b4e1e67f549142b71f7719c51 (diff)
downloadrust-60606456d3b5cd4baf68f18191b0cfca57d9c85c.tar.gz
rust-60606456d3b5cd4baf68f18191b0cfca57d9c85c.zip
Rollup merge of #94352 - jethrogb:fix-sgx-docs-build, r=Mark-Simulacrum
Fix SGX docs build

Without this, I get
```
error[E0432]: unresolved import `crate::sys::cvt`
  --> library/std/src/os/fd/owned.rs:12:5
   |
12 | use crate::sys::cvt;
   |     ^^^^^^^^^^^^^^^ no `cvt` in `sys`
```
when running rustdoc on `std` for the x86_64-fortanix-unknown-sgx target.
-rw-r--r--library/std/src/os/fd/owned.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/os/fd/owned.rs b/library/std/src/os/fd/owned.rs
index 71c660e7186..d72f9a2ff9c 100644
--- a/library/std/src/os/fd/owned.rs
+++ b/library/std/src/os/fd/owned.rs
@@ -8,7 +8,7 @@ use crate::fmt;
 use crate::fs;
 use crate::marker::PhantomData;
 use crate::mem::forget;
-#[cfg(not(target_os = "wasi"))]
+#[cfg(not(any(target_os = "wasi", target_env = "sgx")))]
 use crate::sys::cvt;
 use crate::sys_common::{AsInner, FromInner, IntoInner};