Can't run x.py dist on rust 1.85.0 source distribution

[orium]

On the rust 1.85.0 source distribution (from https//static.rust-lang.org/dist/2025-02-20/rustc-1.85.0-src.tar.xz) it's not possible to build rustc with ./x.py dist:

Steps to reproduce:

$ curl -O https://static.rust-lang.org/dist/2025-02-20/rustc-1.85.0-src.tar.xz
$ tar xf rustc-1.85.0-src.tar.xz
$ cd rustc-1.85.0-src
$ cp config.example.toml config.toml
$ ./x.py dist
⋮
thread 'main' panicked at src/bootstrap/src/utils/helpers.rs:441:5:
std::fs::read_dir(dir) failed with No such file or directory (os error 2)

If I add a debug println!() I can see it is failing because the directory src/gcc does not exist. It did exist in rustc-1.84.0-src:

$ ls rustc-1.84.0-src/src/gcc
ABOUT-NLS           compile       configure        COPYING3      gotools     libbacktrace  libgcc       libiberty     libssp           ltmain.sh       maintainer-scripts  mkdep           SECURITY.txt
ar-lib              config        configure.ac     COPYING3.LIB  include     libcc1        libgfortran  libitm        libstdc++-v3     lto-plugin      MAINTAINERS         mkinstalldirs   symlink-tree
c++tools            config-ml.in  contrib          depcomp       INSTALL     libcody       libgm2       libobjc       libtool-ldflags  ltoptions.m4    Makefile.def        move-if-change  test-driver
ChangeLog           config.guess  COPYING          fixincludes   install-sh  libcpp        libgo        libphobos     libtool.m4       ltsugar.m4      Makefile.in         multilib.am     ylwrap
ChangeLog.jit       config.rpath  COPYING.LIB      gcc           libada      libdecnumber  libgomp      libquadmath   libvtv           ltversion.m4    Makefile.tpl        patches         zlib
ChangeLog.tree-ssa  config.sub    COPYING.RUNTIME  gnattools     libatomic   libffi        libgrust     libsanitizer  ltgcc.m4         lt~obsolete.m4  missing             README
$ ls rustc-1.85.0-src/src/gcc
"rustc-1.85.0-src/src/gcc": No such file or directory (os error 2)

Was the rustc-1.85.0-src.tar.xz wrongly packaged or did something change?

[bobrik]

The dir disappeared from the nightly on 2025-01-21:

$ curl -s https://static.rust-lang.org/dist/2025-01-20/rustc-nightly-src.tar.xz | tar tvv -J | grep rustc-nightly-src/src/gcc/gcc$
drwxr-xr-x 0/0               0 2006-07-24 01:21 rustc-nightly-src/src/gcc/gcc
$ curl -s https://static.rust-lang.org/dist/2025-01-21/rustc-nightly-src.tar.xz | tar tvv -J | grep rustc-nightly-src/src/gcc/gcc$
$

The corresponding range is 9a1d156..f3d1d47.

[bobrik]

I think it's #135658. cc @Kobzol, @cuviper

[Kobzol]

This is caused by this call.

I'm not sure why we even build the source tarball from within a source tarball during x dist, lol, that doesn't seem needed.

[orium]

Creating src/gcc/ and putting a file is enough to make x.py dist work.