about summary refs log tree commit diff
path: root/src/libstd/sys_common
diff options
context:
space:
mode:
authorJethro Beekman <jethro@fortanix.com>2018-08-27 21:33:26 -0700
committerJethro Beekman <jethro@fortanix.com>2018-12-07 11:26:50 +0530
commit4a3505682e97c8e667338056ae216e4b84b22dd7 (patch)
tree64f04641da2097afb5c6a386f8e26a36a2687e6e /src/libstd/sys_common
parentc559216ad0d2f0737f8dbb51a7d42b1727b77b3c (diff)
downloadrust-4a3505682e97c8e667338056ae216e4b84b22dd7.tar.gz
rust-4a3505682e97c8e667338056ae216e4b84b22dd7.zip
Add x86_64-fortanix-unknown-sgx target to libstd and dependencies
The files src/libstd/sys/sgx/*.rs are mostly copied/adapted from
the wasm target.

This also updates the dlmalloc submodule to the very latest version.
Diffstat (limited to 'src/libstd/sys_common')
-rw-r--r--src/libstd/sys_common/mod.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs
index 4b8cde3d1f4..881794d9f16 100644
--- a/src/libstd/sys_common/mod.rs
+++ b/src/libstd/sys_common/mod.rs
@@ -57,9 +57,11 @@ pub mod bytestring;
 pub mod process;
 
 cfg_if! {
-    if #[cfg(any(target_os = "cloudabi", target_os = "l4re", target_os = "redox"))] {
-        pub use sys::net;
-    } else if #[cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))] {
+    if #[cfg(any(target_os = "cloudabi",
+                 target_os = "l4re",
+                 target_os = "redox",
+                 all(target_arch = "wasm32", not(target_os = "emscripten")),
+                 target_env = "sgx"))] {
         pub use sys::net;
     } else {
         pub mod net;