diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2019-12-07 00:10:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-07 00:10:00 +0900 |
| commit | fd4cec0303d2256e37f3e926e112aaa2d8b38a8b (patch) | |
| tree | e9564d3c3652511394a9fbb4890ad8f648c8af6a | |
| parent | 0df1609215bb3080c463d38f899fc6b723229536 (diff) | |
| parent | 22d9f20f606eb69c5d2eac345dc4e5dfe36d27cc (diff) | |
| download | rust-fd4cec0303d2256e37f3e926e112aaa2d8b38a8b.tar.gz rust-fd4cec0303d2256e37f3e926e112aaa2d8b38a8b.zip | |
Rollup merge of #67023 - jethrogb:jb/bootstrap-target-linker, r=alexcrichton
SGX: Fix target linker used by bootstrap Bootstrap, for some reason, overrides the target linker. This is not correct for x86_64-fortanix-unknown-sgx. Add such targets to the list of exceptions. r? @alexcrichton
| -rw-r--r-- | src/bootstrap/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 39d7ea922bc..7ea2bb126a6 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -810,6 +810,7 @@ impl Build { !target.contains("emscripten") && !target.contains("wasm32") && !target.contains("nvptx") && + !target.contains("fortanix") && !target.contains("fuchsia") { Some(self.cc(target)) } else { |