Skip to content

Commit

Permalink
Rollup merge of rust-lang#67023 - jethrogb:jb/bootstrap-target-linker…
Browse files Browse the repository at this point in the history
…, 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
  • Loading branch information
JohnTitor committed Dec 6, 2019
2 parents 0df1609 + 22d9f20 commit fd4cec0
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/bootstrap/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit fd4cec0

Please sign in to comment.