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

Use a relative bindir for rustdoc to find rustc #66317

Merged
merged 2 commits into from
Nov 13, 2019

Commits on Nov 11, 2019

  1. Use a relative bindir for rustdoc to find rustc

    In bootstrap, we set `RUSTC_INSTALL_BINDIR` to `config.bindir`, so
    rustdoc can find rustc relative to the toolchain sysroot. However, if a
    distro script like Fedora's `%configure` sets an absolute path, then
    rustdoc's `sysroot.join(bin_path)` ignores that sysroot altogether.
    
    That would be OK once the toolchain is actually installed, but it breaks
    the in-tree doc tests during the build, since `/usr/bin/rustc` is still
    the old version. So now we try to make `RUSTC_INSTALL_BINDIR` relative
    to the sysroot prefix in the first place.
    cuviper committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    1aee3e4 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2019

  1. Configuration menu
    Copy the full SHA
    bfa5e5f View commit details
    Browse the repository at this point in the history