Rustbuild regression fixes#43430

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

Mark-Simulacrum:rustbuild-fixesMark-Simulacrum/rust:rustbuild-fixesCopy head branch name to clipboard