diff options
| author | bors <bors@rust-lang.org> | 2024-11-14 10:59:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-14 10:59:49 +0000 |
| commit | a4cedecc9ec76b46dcbb954750068c832cf2dd43 (patch) | |
| tree | 5cca9e887688858b4d1473a3c5d322e3c6fe7593 /src/ci | |
| parent | dae7ac133b9eda152784c075facb31a6688c92b1 (diff) | |
| parent | e6cd8699eab4c434a54c92aa1747e97dc5da3663 (diff) | |
| download | rust-a4cedecc9ec76b46dcbb954750068c832cf2dd43.tar.gz rust-a4cedecc9ec76b46dcbb954750068c832cf2dd43.zip | |
Auto merge of #133032 - GuillaumeGomez:rollup-vqakdmw, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #132010 (ci: Enable full `debuginfo-level=2` in `DEPLOY_ALT`) - #132310 (compiletest: add `max-llvm-major-version` directive) - #132773 (PassWrapper: disable UseOdrIndicator for Asan Win32) - #133013 (compiletest: known-bug / crashes: allow for an "auxiliary" directory to contain files that do not have a "known-bug" directive) - #133027 (Fix a copy-paste issue in the NuttX raw type definition) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/run.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index d9c58d9a02a..5690d8edea6 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -115,7 +115,12 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNE if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.remap-debuginfo" - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --debuginfo-level-std=1" + + if [ "$DEPLOY_ALT" != "" ]; then + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --debuginfo-level=2" + else + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --debuginfo-level-std=1" + fi if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions" |