Fix bootstrap.py issues with new rustbuild build system (fixes #39469)#39471

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

djc:bootstrap-userdjc/rust:bootstrap-userCopy head branch name to clipboard