diff options
| author | bors <bors@rust-lang.org> | 2025-06-28 22:13:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-28 22:13:42 +0000 |
| commit | cf38b8e663f15db10ce49d7bbce02c99fc3dbc0c (patch) | |
| tree | 188e9299c1c3de8ac30fedbe365acb8fe49da568 /src/ci | |
| parent | 11ad40bb839ca16f74784b4ab72596ad85587298 (diff) | |
| parent | a62de822fa254bb062a9f927c00d7cc82580d8e4 (diff) | |
| download | rust-cf38b8e663f15db10ce49d7bbce02c99fc3dbc0c.tar.gz rust-cf38b8e663f15db10ce49d7bbce02c99fc3dbc0c.zip | |
Auto merge of #143157 - matthiaskrgr:rollup-90rtm3a, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang/rust#123476 (std::net: adding `unix_socket_exclbind` feature for solaris/illumos.) - rust-lang/rust#142708 (Do not include NUL-terminator in computed length) - rust-lang/rust#142963 (Skip unnecessary components in x64 try builds) - rust-lang/rust#142987 (rustdoc: show attributes on enum variants) - rust-lang/rust#143031 (Add windows-gnullvm hosts to the manifest) - rust-lang/rust#143082 (update internal `send_signal` comment) - rust-lang/rust#143110 (Use tidy to sort `sym::*` items) - rust-lang/rust#143111 (BTreeSet: remove duplicated code by reusing `from_sorted_iter`) - rust-lang/rust#143114 (Minor Documentation Improvements) r? `@ghost` `@rustbot` modify labels: rollup try-job: dist-i586-gnu-i586-i686-musl
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-x86_64-linux/dist.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/dist.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/dist.sh index 064ac5b0a5e..924bdbc7615 100755 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/dist.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/dist.sh @@ -10,4 +10,7 @@ python3 ../x.py build --set rust.debug=true opt-dist build-manifest bootstrap # Use GCC for building GCC, as it seems to behave badly when built with Clang -CC=/rustroot/bin/cc CXX=/rustroot/bin/c++ python3 ../x.py dist gcc +# Only build GCC on full builds, not try builds +if [ "${DIST_TRY_BUILD:-0}" == "0" ]; then + CC=/rustroot/bin/cc CXX=/rustroot/bin/c++ python3 ../x.py dist gcc +fi |