diff options
| author | Adrian Cruceru <cruceruadrian@gmail.com> | 2020-06-25 12:01:02 +0200 |
|---|---|---|
| committer | Adrian Cruceru <cruceruadrian@gmail.com> | 2020-06-25 12:01:02 +0200 |
| commit | 343a9212b0421b5d81c15b2ef4ef0f02c19d2850 (patch) | |
| tree | dd3152c6361f6d64513b0f5e7d8705573b362f0a /src/bootstrap | |
| parent | f3b1582bb926a7005ba77bfaa44b1ed59a587509 (diff) | |
| download | rust-343a9212b0421b5d81c15b2ef4ef0f02c19d2850.tar.gz rust-343a9212b0421b5d81c15b2ef4ef0f02c19d2850.zip | |
Fix comments
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/compile.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 5fb489cb9ac..345741d9009 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -133,6 +133,13 @@ fn copy_third_party_objects( ) -> Vec<(PathBuf, DependencyType)> { let mut target_deps = vec![]; + // FIXME: remove this in 2021 + if target == "x86_64-fortanix-unknown-sgx" { + if env::var_os("X86_FORTANIX_SGX_LIBS").is_some() { + builder.info("Warning: X86_FORTANIX_SGX_LIBS environment variable is ignored, libunwind is now compiled as part of rustbuild"); + } + } + if builder.config.sanitizers && compiler.stage != 0 { // The sanitizers are only copied in stage1 or above, // to avoid creating dependency on LLVM. |