Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4f2dc04

Browse files
committedMay 23, 2024
Auto merge of rust-lang#125444 - matthiaskrgr:rollup-379ukwx, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#125210 (Cleanup: Fix up some diagnostics) - rust-lang#125224 (Migrate `run-make/issue-53964` to `rmake`) - rust-lang#125227 (Migrate `run-make/issue-30063` to `rmake`) - rust-lang#125383 (Rewrite `emit`, `mixing-formats` and `bare-outfile` `run-make` tests in `rmake.rs` format) - rust-lang#125401 (Migrate `run-make/rustdoc-scrape-examples-macros` to `rmake.rs`) - rust-lang#125409 (Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`) - rust-lang#125416 (Use correct param-env in `MissingCopyImplementations`) - rust-lang#125421 (Rewrite `core-no-oom-handling`, `issue-24445` and `issue-38237` `run-make` tests to new `rmake.rs` format) - rust-lang#125438 (Remove unneeded string conversion) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 39d2f2a + 0ec485f commit 4f2dc04

File tree

51 files changed

+419
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+419
-265
lines changed
 

‎src/tools/run-make-support/src/cc.rs

+8
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ impl Cc {
4545
self
4646
}
4747

48+
/// Adds directories to the list that the linker searches for libraries.
49+
/// Equivalent to `-L`.
50+
pub fn library_search_path<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
51+
self.cmd.arg("-L");
52+
self.cmd.arg(path.as_ref());
53+
self
54+
}
55+
4856
/// Specify `-o` or `-Fe`/`-Fo` depending on platform/compiler. This assumes that the executable
4957
/// is under `$TMPDIR`.
5058
pub fn out_exe(&mut self, name: &str) -> &mut Self {

‎src/tools/run-make-support/src/rustc.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,20 @@ impl Rustc {
156156
self
157157
}
158158

159-
/// Add a directory to the library search path. Equivalent to `-L`` in rustc.
159+
/// Add a directory to the library search path. Equivalent to `-L` in rustc.
160160
pub fn library_search_path<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
161161
self.cmd.arg("-L");
162162
self.cmd.arg(path.as_ref());
163163
self
164164
}
165165

166+
/// Override the system root. Equivalent to `--sysroot` in rustc.
167+
pub fn sysroot<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
168+
self.cmd.arg("--sysroot");
169+
self.cmd.arg(path.as_ref());
170+
self
171+
}
172+
166173
/// Specify the edition year.
167174
pub fn edition(&mut self, edition: &str) -> &mut Self {
168175
self.cmd.arg("--edition");
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.