diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-07-18 14:21:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 14:21:56 +0900 |
| commit | 81d0b7040233bc306e66d83654b7e969f8057aac (patch) | |
| tree | e62c77e49a4a2d5fde148a7d2197cee10eb3de37 /compiler/rustc_codegen_llvm/src | |
| parent | eef510865acf2bd77cdd10f43226e320eefa0509 (diff) | |
| parent | ce59f1aac53ba209d0a97af720f596f943fcfbaa (diff) | |
| download | rust-81d0b7040233bc306e66d83654b7e969f8057aac.tar.gz rust-81d0b7040233bc306e66d83654b7e969f8057aac.zip | |
Rollup merge of #87092 - ricobbe:fix-raw-dylib-multiple-definitions, r=petrochenkov
Remove nondeterminism in multiple-definitions test Compare all fields in `DllImport` when sorting to avoid nondeterminism in the error for multiple inconsistent definitions of an extern function. Restore the multiple-definitions test. Resolves #87084.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/lib.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs index 26fd1cfbcd0..aa4db1622b2 100644 --- a/compiler/rustc_codegen_llvm/src/lib.rs +++ b/compiler/rustc_codegen_llvm/src/lib.rs @@ -292,9 +292,7 @@ impl CodegenBackend for LlvmCodegenBackend { // Run the linker on any artifacts that resulted from the LLVM run. // This should produce either a finished executable or library. - link_binary::<LlvmArchiveBuilder<'_>>(sess, &codegen_results, outputs); - - Ok(()) + link_binary::<LlvmArchiveBuilder<'_>>(sess, &codegen_results, outputs) } } |