Skip to content

Commit

Permalink
Auto merge of rust-lang#98989 - dpaoliello:rawdylibbin, r=michaelwoer…
Browse files Browse the repository at this point in the history
…ister

Enable raw-dylib for bin crates

Fixes rust-lang#93842

When `raw-dylib` is used in a `bin` crate, we need to collect all of the `raw-dylib` functions, generate the import library and add that to the linker command line.

I also changed the tests so that 1) the C++ dlls are created after the Rust dlls, thus there is no chance of accidentally using them in the Rust linking process and 2) disabled generating import libraries when building with MSVC.
  • Loading branch information
bors committed Jul 26, 2022
2 parents 745193d + 0fed1a5 commit 42dd106
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/archive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,12 +204,16 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
any_members
}

fn inject_dll_import_lib(
&mut self,
fn sess(&self) -> &Session {
self.sess
}

fn create_dll_import_lib(
_sess: &Session,
_lib_name: &str,
_dll_imports: &[rustc_session::cstore::DllImport],
_tmpdir: &rustc_data_structures::temp_dir::MaybeTempDir,
) {
bug!("injecting dll imports is not supported");
_tmpdir: &Path,
) -> PathBuf {
bug!("creating dll imports is not supported");
}
}

0 comments on commit 42dd106

Please sign in to comment.