diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-03 19:41:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-03 19:41:54 +0100 |
| commit | 69f1323167c71b79561fb4ac297de2fbd75eb017 (patch) | |
| tree | deaee689e9906a46e405b8da2d3e58184183b9c0 /src/librustc_codegen_ssa | |
| parent | 71d1286bdf5cc094532a6263ad4cfaad5c54d097 (diff) | |
| parent | 54b206034fe50b2234ab8ddb15214f723fe8d951 (diff) | |
| download | rust-69f1323167c71b79561fb4ac297de2fbd75eb017.tar.gz rust-69f1323167c71b79561fb4ac297de2fbd75eb017.zip | |
Rollup merge of #66957 - parthsane:pvs/ftx_lld_linker, r=alexcrichton
Change Linker for x86_64-fortanix-unknown-sgx target to rust-lld Changed linker for `x86_64-fortanix-unknown-sgx` target to `rust-lld` This change needed the RelaxELFRelocations flag to be set for it to work correctly r? @jethrogb
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/linker.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs index 999cc406585..4278852123b 100644 --- a/src/librustc_codegen_ssa/back/linker.rs +++ b/src/librustc_codegen_ssa/back/linker.rs @@ -398,7 +398,8 @@ impl<'a> Linker for GccLinker<'a> { fn export_symbols(&mut self, tmpdir: &Path, crate_type: CrateType) { // Symbol visibility in object files typically takes care of this. - if crate_type == CrateType::Executable { + if crate_type == CrateType::Executable && + self.sess.target.target.options.override_export_symbols.is_none() { return; } |