Skip to content

Commit

Permalink
Auto merge of #1301 - dingelish:master, r=gnzlbg
Browse files Browse the repository at this point in the history
Add essential target_vendor check for sgx

As discussed in issue [57231](rust-lang/rust#57231), the current `sgx` branch only works for Fortanix's sgx platform. So the `target_vendor` should be checked here.

Signed-off-by: Yu Ding <dingelish@gmail.com>
  • Loading branch information
bors committed Mar 11, 2019
2 parents 920ee0f + 21503ef commit e1c9ad1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/lib.rs
Expand Up @@ -109,7 +109,7 @@ cfg_if! {
} else if #[cfg(target_os = "hermit")] {
mod hermit;
pub use hermit::*;
} else if #[cfg(target_env = "sgx")] {
} else if #[cfg(all(target_env = "sgx", target_vendor = "fortanix"))] {
mod sgx;
pub use sgx::*;
} else {
Expand Down

0 comments on commit e1c9ad1

Please sign in to comment.