Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate run make issue 15460 #125886

Merged
merged 4 commits into from
Jul 23, 2024
+16 −8
Merged

Migrate run make issue 15460 #125886

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e0c203
Add new `MSVC_LIB_PATH` runtest environment variable to know location…
GuillaumeGomez Jun 2, 2024
84eee68
Add `run_make_support::build_native_static_lib` function
GuillaumeGomez Jun 2, 2024
5257ca7
Migrate `run-make/issue-15460` to `rmake.rs`
GuillaumeGomez Jun 2, 2024
3de5252
Rename `tests/run-make/issue-15460` into `tests/run-make/link-native-…
GuillaumeGomez Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add new MSVC_LIB_PATH runtest environment variable to know location… 
… of the `msvc_lib` binary
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Jul 22, 2024
commit 7e0c203f2d4320ad2299a78f6d1dc8ae00cf5bc8
2 changes: 2 additions & 0 deletions src/tools/compiletest/src/runtest.rs
View file
Original file line number Diff line number Diff line change
@@ -3382,6 +3382,7 @@ impl<'test> TestCx<'test> {
cmd.env("IS_MSVC", "1")
.env("IS_WINDOWS", "1")
.env("MSVC_LIB", format!("'{}' -nologo", lib.display()))
.env("MSVC_LIB_PATH", format!("{}", lib.display()))
.env("CC", format!("'{}' {}", self.config.cc, cflags))
.env("CXX", format!("'{}' {}", &self.config.cxx, cxxflags));
} else {
@@ -3752,6 +3753,7 @@ impl<'test> TestCx<'test> {
cmd.env("IS_MSVC", "1")
.env("IS_WINDOWS", "1")
.env("MSVC_LIB", format!("'{}' -nologo", lib.display()))
.env("MSVC_LIB_PATH", format!("{}", lib.display()))
// Note: we diverge from legacy run_make and don't lump `CC` the compiler and
// default flags together.
.env("CC_DEFAULT_FLAGS", &cflags)