diff options
| author | Jubilee <46493976+workingjubilee@users.noreply.github.com> | 2024-08-15 18:44:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-15 18:44:17 -0700 |
| commit | 759f93f42145d150de2ff9fd8c96d31ad79158fa (patch) | |
| tree | 62a16727a9229492688ba108aea6a54da887192a /src | |
| parent | 5858329f1adf44ba39815d2040a0cb1478d37bc8 (diff) | |
| parent | 51628fb6662128306b4f5aa852729fff6b7f8e00 (diff) | |
| download | rust-759f93f42145d150de2ff9fd8c96d31ad79158fa.tar.gz rust-759f93f42145d150de2ff9fd8c96d31ad79158fa.zip | |
Rollup merge of #129018 - Oneirical:nmemonic-artifice, r=jieyouxu
Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). Please try: // try-job: test-various (ATTEMPTED: IGNORE RESTORED) try-job: x86_64-msvc try-job: aarch64-apple try-job: aarch64-gnu try-job: x86_64-mingw try-job: i686-mingw
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/run-make-support/src/external_deps/llvm.rs | 6 | ||||
| -rw-r--r-- | src/tools/tidy/src/allowed_run_make_makefiles.txt | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/run-make-support/src/external_deps/llvm.rs b/src/tools/run-make-support/src/external_deps/llvm.rs index e1b7190f476..e9315856cd7 100644 --- a/src/tools/run-make-support/src/external_deps/llvm.rs +++ b/src/tools/run-make-support/src/external_deps/llvm.rs @@ -297,6 +297,12 @@ impl LlvmAr { self } + /// Print the table of contents. + pub fn table_of_contents(&mut self) -> &mut Self { + self.cmd.arg("t"); + self + } + /// Provide an output, then an input file. Bundled in one function, as llvm-ar has /// no "--output"-style flag. pub fn output_input(&mut self, out: impl AsRef<Path>, input: impl AsRef<Path>) -> &mut Self { diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index 9f468842d3f..6f615a848be 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -10,9 +10,7 @@ run-make/libtest-json/Makefile run-make/libtest-junit/Makefile run-make/libtest-thread-limit/Makefile run-make/macos-deployment-target/Makefile -run-make/native-link-modifier-bundle/Makefile run-make/reproducible-build/Makefile -run-make/rlib-format-packed-bundled-libs/Makefile run-make/split-debuginfo/Makefile run-make/symbol-mangling-hashed/Makefile run-make/translation/Makefile |