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_common | |
| 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_common')
| -rw-r--r-- | src/libstd/sys_common/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs index ee3916b35f9..c18b603a635 100644 --- a/src/libstd/sys_common/mod.rs +++ b/src/libstd/sys_common/mod.rs @@ -51,7 +51,7 @@ cfg_if! { target_os = "l4re", target_os = "redox", all(target_arch = "wasm32", not(target_os = "emscripten")), - target_env = "sgx"))] { + all(target_vendor = "fortanix", target_env = "sgx")))] { pub use sys::net; } else { pub mod net; |