Rollup merge of #139574 - onur-ozkan:better-channel-handling, r=onur-ozkan

bootstrap: improve `channel` handling

Fixes rust-lang/rust#139569

See [this comment](rust-lang/rust#139574 (comment)) for the explanation of this bug.

Author: Zalathar