Skip to content

Commit

Permalink
Rollup merge of #128804 - ChrisDenton:redudant, r=jieyouxu
Browse files Browse the repository at this point in the history
run-make: enable msvc for redundant-libs

The issue here was that `foo` was not exporting any functions therefore creating an import library was unnecessary and elided by the linker.

I fixed it by exporting the functions.

try-job: x86_64-msvc
try-job: i686-msvc
  • Loading branch information
matthiaskrgr authored Aug 9, 2024
2 parents 7485f8b + 599bcb5 commit 408bacc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 8 additions & 2 deletions tests/run-make/redundant-libs/foo.c
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
void foo1() {}
void foo2() {}
#ifdef _MSC_VER
#define DllExport __declspec(dllexport)
#else
#define DllExport
#endif

DllExport void foo1() {}
DllExport void foo2() {}
6 changes: 0 additions & 6 deletions tests/run-make/redundant-libs/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@

//@ ignore-cross-compile
// Reason: the compiled binary is executed
//@ ignore-windows-msvc
// Reason: this test links libraries via link.exe, which only accepts the import library
// for the dynamic library, i.e. `foo.dll.lib`. However, build_native_dynamic_lib only
// produces `foo.dll` - the dynamic library itself. To make this test work on MSVC, one
// would need to derive the import library from the dynamic library.
// See https://stackoverflow.com/questions/9360280/

use run_make_support::{
build_native_dynamic_lib, build_native_static_lib, cwd, is_msvc, rfs, run, rustc,
Expand Down

0 comments on commit 408bacc

Please sign in to comment.