diff options
| author | bors <bors@rust-lang.org> | 2019-01-02 15:09:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-02 15:09:41 +0000 |
| commit | ec194646fef1a467073ad74b8b68f6f202cfce97 (patch) | |
| tree | f83f8bce1f879b7e12e243f6198e7464ec928dff /src/libstd/sys | |
| parent | a36b960df626cbb8bea74f01243318b73f0bd201 (diff) | |
| parent | 20e0395e66557a1be055ec3f11c35082bf9a5882 (diff) | |
| download | rust-ec194646fef1a467073ad74b8b68f6f202cfce97.tar.gz rust-ec194646fef1a467073ad74b8b68f6f202cfce97.zip | |
Auto merge of #57243 - dingelish:master, r=sfackler
Bound sgx target_env with fortanix as target_vendor This PR adds `target_vendor` check, as discussed in issue [57231](https://github.com/rust-lang/rust/issues/57231) Signed-off-by: Yu Ding <dingelish@gmail.com>
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/mod.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libstd/sys/mod.rs b/src/libstd/sys/mod.rs index de9e09bf705..f398a2a6225 100644 --- a/src/libstd/sys/mod.rs +++ b/src/libstd/sys/mod.rs @@ -38,7 +38,7 @@ cfg_if! { } else if #[cfg(target_arch = "wasm32")] { mod wasm; pub use self::wasm::*; - } else if #[cfg(target_env = "sgx")] { + } else if #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))] { mod sgx; pub use self::sgx::*; } else { @@ -55,7 +55,9 @@ cfg_if! { if #[cfg(any(unix, target_os = "redox"))] { // On unix we'll document what's already available pub use self::ext as unix_ext; - } else if #[cfg(any(target_os = "cloudabi", target_arch = "wasm32", target_env = "sgx"))] { + } else if #[cfg(any(target_os = "cloudabi", + target_arch = "wasm32", + all(target_vendor = "fortanix", target_env = "sgx")))] { // On CloudABI and wasm right now the module below doesn't compile // (missing things in `libc` which is empty) so just omit everything // with an empty module @@ -76,7 +78,9 @@ cfg_if! { // On windows we'll just be documenting what's already available #[allow(missing_docs)] pub use self::ext as windows_ext; - } else if #[cfg(any(target_os = "cloudabi", target_arch = "wasm32", target_env = "sgx"))] { + } else if #[cfg(any(target_os = "cloudabi", + target_arch = "wasm32", + all(target_vendor = "fortanix", target_env = "sgx")))] { // On CloudABI and wasm right now the shim below doesn't compile, so // just omit it #[unstable(issue = "0", feature = "std_internals")] |