Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootstrap: Merge the libtest build step with libstd #63637

Merged
merged 1 commit into from
Aug 24, 2019

Commits on Aug 23, 2019

  1. bootstrap: Merge the libtest build step with libstd

    Since its inception rustbuild has always worked in three stages: one for
    libstd, one for libtest, and one for rustc. These three stages were
    architected around crates.io dependencies, where rustc wants to depend
    on crates.io crates but said crates don't explicitly depend on libstd,
    requiring a sysroot assembly step in the middle. This same logic was
    applied for libtest where libtest wants to depend on crates.io crates
    (`getopts`) but `getopts` didn't say that it depended on std, so it
    needed `std` built ahead of time.
    
    Lots of time has passed since the inception of rustbuild, however,
    and we've since gotten to the point where even `std` itself is depending
    on crates.io crates (albeit with some wonky configuration). This
    commit applies the same logic to the two dependencies that the `test`
    crate pulls in from crates.io, `getopts` and `unicode-width`. Over the
    many years since rustbuild's inception `unicode-width` was the only
    dependency picked up by the `test` crate, so the extra configuration
    necessary to get crates building in this crate graph is unlikely to be
    too much of a burden on developers.
    
    After this patch it means that there are now only two build phasese of
    rustbuild, one for libstd and one for rustc. The libtest/libproc_macro
    build phase is all lumped into one now with `std`.
    
    This was originally motivated by rust-lang/cargo#7216 where Cargo was
    having to deal with synthesizing dependency edges but this commit makes
    them explicit in this repository.
    alexcrichton committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    b47c969 View commit details
    Browse the repository at this point in the history