rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bound sgx target_env with fortanix as target_vendor

Browse Source 
Signed-off-by: Yu Ding <dingelish@gmail.com>
This commit is contained in:
Yu Ding
2018-12-31 15:45:42 -08:00
parent 6efaef6189
commit d04f5208ba
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libtest/lib.rs
View File

@@ -23,6 +23,7 @@
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
html_root_url = "https://doc.rust-lang.org/nightly/", test(attr(deny(warnings))))]
#![feature(asm)]
#![feature(cfg_target_vendor)]
#![feature(fnbox)]
#![cfg_attr(any(unix, target_os = "cloudabi"), feature(libc))]
#![feature(nll)]
@@ -1015,7 +1016,7 @@ fn use_color(opts: &TestOpts) -> bool {
#[cfg(any(target_os = "cloudabi",
target_os = "redox",
all(target_arch = "wasm32", not(target_os = "emscripten")),
target_env = "sgx"))]
all(target_vendor = "fortanix", target_env = "sgx")))]
fn stdout_isatty() -> bool {
// FIXME: Implement isatty on Redox and SGX
false
@@ -1246,7 +1247,8 @@ fn get_concurrency() -> usize {
1
}
#[cfg(any(all(target_arch = "wasm32", not(target_os = "emscripten")), target_env = "sgx"))]
#[cfg(any(all(target_arch = "wasm32", not(target_os = "emscripten")),
all(target_vendor = "fortanix", target_env = "sgx")))]
fn num_cpus() -> usize {
1
}