Add building of aesm for SGX target on linux in CI

fortanix · Mar 19, 2020 · cf9c8e5 · cf9c8e5
1 parent a22a993
commit cf9c8e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,7 @@ matrix:
         - cargo test --verbose -p sgx-isa --features sgxstd -Z package-features --target x86_64-fortanix-unknown-sgx --no-run
         - cargo test --verbose -p sgxs-tools --features pe2sgxs --bin isgx-pe2sgx -Z package-features
         - cargo test --verbose -p dcap-ql --features link -Z package-features
+        - pushd aesm-client/ && cargo build --target=x86_64-fortanix-unknown-sgx && popd  
 
     - os: windows
       before_install:
@@ -55,4 +56,3 @@ matrix:
         - cargo test --verbose -p sgxs
         - cargo test --verbose -p sgxs-loaders
         - cargo test --verbose -p sgxs-tools --features pe2sgxs --bin isgx-pe2sgx -Z package-features
-
diff --git a/aesm-client/src/lib.rs b/aesm-client/src/lib.rs
@@ -37,7 +37,7 @@ use std::net::TcpStream;
 use protobuf::ProtobufResult;
 #[cfg(feature = "sgxs")]
 use sgxs::einittoken::{Einittoken, EinittokenProvider};
-#[cfg(feature = "sgxs")]
+#[cfg(not(target_env = "sgx"))]
 use sgx_isa::{Attributes, Sigstruct};
 
 include!(concat!(env!("OUT_DIR"), "/mod_aesm_proto.rs"));
@@ -212,7 +212,7 @@ impl AesmClient {
         )
     }
 
-    #[cfg(feature = "sgxs")]
+    #[cfg(not(target_env = "sgx"))]
     pub fn get_launch_token(
         &self,
         sigstruct: &Sigstruct,