diff options
| author | bors <bors@rust-lang.org> | 2019-05-10 09:56:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-10 09:56:56 +0000 |
| commit | 0ac53da03dad79655e2f3e65a58f94a2f3314d5f (patch) | |
| tree | e89e2bfc776db4373a0d2183440dbd12560bf82e /src/libstd | |
| parent | c441b8aca5f572a4a677b8243d2507a636afa819 (diff) | |
| parent | adb998fe21f148e8f84fc1262725c4385216c95d (diff) | |
| download | rust-0ac53da03dad79655e2f3e65a58f94a2f3314d5f.tar.gz rust-0ac53da03dad79655e2f3e65a58f94a2f3314d5f.zip | |
Auto merge of #60684 - jethrogb:jb/sgx-test, r=joshtriplett
Fix cfg(test) build on SGX Introduced in #60657 r? @joshtriplett
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 3976f2344e2..2401946536f 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -223,6 +223,7 @@ #![cfg_attr(all(target_vendor = "fortanix", target_env = "sgx"), feature(global_asm, slice_index_methods, decl_macro, coerce_unsized, sgx_platform, ptr_wrapping_offset_from))] +#![cfg_attr(all(test, target_vendor = "fortanix", target_env = "sgx"), feature(fixed_size_array))] // std is implemented with unstable features, many of which are internal // compiler details that will never be stable |