about summary refs log tree commit diff
path: root/src/libpanic_abort
diff options
context:
space:
mode:
authorYu Ding <dingelish@gmail.com>2018-12-31 15:45:42 -0800
committerYu Ding <dingelish@gmail.com>2018-12-31 16:32:56 -0800
commitd04f5208ba67c90e145438b459f99f2d634026ae (patch)
tree89a54526da1c347910242fe2121327e8da4830b5 /src/libpanic_abort
parent6efaef61899f6551914156f69809aa7d5854399d (diff)
Bound sgx target_env with fortanix as target_vendor
Signed-off-by: Yu Ding <dingelish@gmail.com>
Diffstat (limited to 'src/libpanic_abort')
-rw-r--r--src/libpanic_abort/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libpanic_abort/lib.rs b/src/libpanic_abort/lib.rs
index 4a22b69eda8..d8dd2e0a113 100644
--- a/src/libpanic_abort/lib.rs
+++ b/src/libpanic_abort/lib.rs
@@ -12,6 +12,7 @@
 #![panic_runtime]
 #![allow(unused_features)]
 
+#![feature(cfg_target_vendor)]
 #![feature(core_intrinsics)]
 #![feature(libc)]
 #![feature(nll)]
@@ -57,7 +58,7 @@ pub unsafe extern fn __rust_start_panic(_payload: usize) -> u32 {
         core::intrinsics::abort();
     }
 
-    #[cfg(target_env="sgx")]
+    #[cfg(all(target_vendor="fortanix", target_env="sgx"))]
     unsafe fn abort() -> ! {
         extern "C" { pub fn panic_exit() -> !; }
         panic_exit();