+++ /dev/null
-From 9efc93c96dd6746460cef916d307b72ba21a7fd0 Mon Sep 17 00:00:00 2001
-From: Mark Rousskov <mark.simulacrum@gmail.com>
-Date: Sun, 3 Mar 2019 09:29:59 -0700
-Subject: [PATCH 1/2] Tools built by the bootstrap compiler must be built by it
-
-This avoids building compilers that we don't need -- most tools will work
-just fine with the downloaded compiler.
----
- src/bootstrap/doc.rs | 6 ++-
- src/bootstrap/test.rs | 10 ++--
- src/bootstrap/tool.rs | 104 +++++++++++++++++++++++++++---------------
- 3 files changed, 78 insertions(+), 42 deletions(-)
-
-diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
-index e0ad0422a6ce..621e3a95473e 100644
---- a/src/bootstrap/doc.rs
-+++ b/src/bootstrap/doc.rs
-@@ -883,7 +883,11 @@ impl Step for ErrorIndex {
- builder.info(&format!("Documenting error index ({})", target));
- let out = builder.doc_out(target);
- t!(fs::create_dir_all(&out));
-- let mut index = builder.tool_cmd(Tool::ErrorIndex);
-+ let compiler = builder.compiler(2, builder.config.build);
-+ let mut index = tool::ErrorIndex::command(
-+ builder,
-+ compiler,
-+ );
- index.arg("html");
- index.arg(out.join("error-index.html"));
-
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index 51412f79c3d0..5abf9d699784 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -414,7 +414,6 @@ impl Step for Miri {
-
- #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
- pub struct CompiletestTest {
-- stage: u32,
- host: Interned<String>,
- }
-
-@@ -427,16 +426,14 @@ impl Step for CompiletestTest {
-
- fn make_run(run: RunConfig<'_>) {
- run.builder.ensure(CompiletestTest {
-- stage: run.builder.top_stage,
- host: run.target,
- });
- }
-
- /// Runs `cargo test` for compiletest.
- fn run(self, builder: &Builder<'_>) {
-- let stage = self.stage;
- let host = self.host;
-- let compiler = builder.compiler(stage, host);
-+ let compiler = builder.compiler(0, host);
-
- let mut cargo = tool::prepare_tool_cargo(builder,
- compiler,
-@@ -1426,7 +1423,10 @@ impl Step for ErrorIndex {
- t!(fs::create_dir_all(&dir));
- let output = dir.join("error-index.md");
-
-- let mut tool = builder.tool_cmd(Tool::ErrorIndex);
-+ let mut tool = tool::ErrorIndex::command(
-+ builder,
-+ builder.compiler(compiler.stage, builder.config.build),
-+ );
- tool.arg("markdown")
- .arg(&output)
- .env("CFG_BUILD", &builder.config.build)
-diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
-index fc1a17d54667..4f2aa0b795dc 100644
---- a/src/bootstrap/tool.rs
-+++ b/src/bootstrap/tool.rs
-@@ -250,9 +250,9 @@ pub fn prepare_tool_cargo(
- cargo
- }
-
--macro_rules! tool {
-+macro_rules! bootstrap_tool {
- ($(
-- $name:ident, $path:expr, $tool_name:expr, $mode:expr
-+ $name:ident, $path:expr, $tool_name:expr
- $(,llvm_tools = $llvm:expr)*
- $(,is_external_tool = $external:expr)*
- ;
-@@ -266,10 +266,7 @@ macro_rules! tool {
-
- impl Tool {
- pub fn get_mode(&self) -> Mode {
-- let mode = match self {
-- $(Tool::$name => $mode,)+
-- };
-- mode
-+ Mode::ToolBootstrap
- }
-
- /// Whether this tool requires LLVM to run
-@@ -282,27 +279,15 @@ macro_rules! tool {
-
- impl<'a> Builder<'a> {
- pub fn tool_exe(&self, tool: Tool) -> PathBuf {
-- let stage = self.tool_default_stage(tool);
- match tool {
- $(Tool::$name =>
- self.ensure($name {
-- compiler: self.compiler(stage, self.config.build),
-+ compiler: self.compiler(0, self.config.build),
- target: self.config.build,
- }),
- )+
- }
- }
--
-- pub fn tool_default_stage(&self, tool: Tool) -> u32 {
-- // Compile the error-index in the same stage as rustdoc to avoid
-- // recompiling rustdoc twice if we can. Otherwise compile
-- // everything else in stage0 as there's no need to rebootstrap
-- // everything.
-- match tool {
-- Tool::ErrorIndex if self.top_stage >= 2 => self.top_stage,
-- _ => 0,
-- }
-- }
- }
-
- $(
-@@ -321,7 +306,8 @@ macro_rules! tool {
-
- fn make_run(run: RunConfig<'_>) {
- run.builder.ensure($name {
-- compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
-+ // snapshot compiler
-+ compiler: run.builder.compiler(0, run.builder.config.build),
- target: run.target,
- });
- }
-@@ -331,7 +317,7 @@ macro_rules! tool {
- compiler: self.compiler,
- target: self.target,
- tool: $tool_name,
-- mode: $mode,
-+ mode: Mode::ToolBootstrap,
- path: $path,
- is_optional_tool: false,
- source_type: if false $(|| $external)* {
-@@ -347,21 +333,67 @@ macro_rules! tool {
- }
- }
-
--tool!(
-- Rustbook, "src/tools/rustbook", "rustbook", Mode::ToolBootstrap;
-- ErrorIndex, "src/tools/error_index_generator", "error_index_generator", Mode::ToolRustc;
-- UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen", Mode::ToolBootstrap;
-- Tidy, "src/tools/tidy", "tidy", Mode::ToolBootstrap;
-- Linkchecker, "src/tools/linkchecker", "linkchecker", Mode::ToolBootstrap;
-- CargoTest, "src/tools/cargotest", "cargotest", Mode::ToolBootstrap;
-- Compiletest, "src/tools/compiletest", "compiletest", Mode::ToolBootstrap, llvm_tools = true;
-- BuildManifest, "src/tools/build-manifest", "build-manifest", Mode::ToolBootstrap;
-- RemoteTestClient, "src/tools/remote-test-client", "remote-test-client", Mode::ToolBootstrap;
-- RustInstaller, "src/tools/rust-installer", "fabricate", Mode::ToolBootstrap,
-- is_external_tool = true;
-- RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes", Mode::ToolBootstrap;
-+bootstrap_tool!(
-+ Rustbook, "src/tools/rustbook", "rustbook";
-+ UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen";
-+ Tidy, "src/tools/tidy", "tidy";
-+ Linkchecker, "src/tools/linkchecker", "linkchecker";
-+ CargoTest, "src/tools/cargotest", "cargotest";
-+ Compiletest, "src/tools/compiletest", "compiletest", llvm_tools = true;
-+ BuildManifest, "src/tools/build-manifest", "build-manifest";
-+ RemoteTestClient, "src/tools/remote-test-client", "remote-test-client";
-+ RustInstaller, "src/tools/rust-installer", "fabricate", is_external_tool = true;
-+ RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes";
- );
-
-+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
-+pub struct ErrorIndex {
-+ pub compiler: Compiler,
-+}
-+
-+impl ErrorIndex {
-+ pub fn command(builder: &Builder<'_>, compiler: Compiler) -> Command {
-+ let mut cmd = Command::new(builder.ensure(ErrorIndex {
-+ compiler
-+ }));
-+ add_lib_path(
-+ vec![PathBuf::from(&builder.sysroot_libdir(compiler, compiler.host))],
-+ &mut cmd,
-+ );
-+ cmd
-+ }
-+}
-+
-+impl Step for ErrorIndex {
-+ type Output = PathBuf;
-+
-+ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-+ run.path("src/tools/error_index_generator")
-+ }
-+
-+ fn make_run(run: RunConfig<'_>) {
-+ // Compile the error-index in the same stage as rustdoc to avoid
-+ // recompiling rustdoc twice if we can.
-+ let stage = if run.builder.top_stage >= 2 { run.builder.top_stage } else { 0 };
-+ run.builder.ensure(ErrorIndex {
-+ compiler: run.builder.compiler(stage, run.builder.config.build),
-+ });
-+ }
-+
-+ fn run(self, builder: &Builder<'_>) -> PathBuf {
-+ builder.ensure(ToolBuild {
-+ compiler: self.compiler,
-+ target: self.compiler.host,
-+ tool: "error_index_generator",
-+ mode: Mode::ToolRustc,
-+ path: "src/tools/error_index_generator",
-+ is_optional_tool: false,
-+ source_type: SourceType::InTree,
-+ extra_features: Vec::new(),
-+ }).expect("expected to build -- essential tool")
-+ }
-+}
-+
- #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
- pub struct RemoteTestServer {
- pub compiler: Compiler,
-@@ -625,7 +657,7 @@ impl<'a> Builder<'a> {
- /// `host`.
- pub fn tool_cmd(&self, tool: Tool) -> Command {
- let mut cmd = Command::new(self.tool_exe(tool));
-- let compiler = self.compiler(self.tool_default_stage(tool), self.config.build);
-+ let compiler = self.compiler(0, self.config.build);
- self.prepare_tool_cmd(compiler, tool, &mut cmd);
- cmd
- }
-@@ -637,7 +669,7 @@ impl<'a> Builder<'a> {
- fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) {
- let host = &compiler.host;
- let mut lib_paths: Vec<PathBuf> = vec![
-- if compiler.stage == 0 && tool != Tool::ErrorIndex {
-+ if compiler.stage == 0 {
- self.build.rustc_snapshot_libdir()
- } else {
- PathBuf::from(&self.sysroot_libdir(compiler, compiler.host))
-
-From 03718ed67a7b8fd57fc27316ec57ac3bc0f13d06 Mon Sep 17 00:00:00 2001
-From: Mark Rousskov <mark.simulacrum@gmail.com>
-Date: Sun, 3 Mar 2019 09:50:56 -0700
-Subject: [PATCH 2/2] Permit getting stage 0 rustdoc
-
-This allows us to e.g. test compiletest, including doctests, in stage 0
-without building a fresh compiler and rustdoc.
----
- src/bootstrap/builder.rs | 15 +++++++--------
- src/bootstrap/dist.rs | 2 +-
- src/bootstrap/doc.rs | 8 ++++----
- src/bootstrap/test.rs | 8 ++++----
- src/bootstrap/tool.rs | 8 +++++---
- 5 files changed, 21 insertions(+), 20 deletions(-)
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 7e6c0a9f52aa..f8b7f25a7543 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -668,20 +668,19 @@ impl<'a> Builder<'a> {
- .map(|entry| entry.path())
- }
-
-- pub fn rustdoc(&self, host: Interned<String>) -> PathBuf {
-- self.ensure(tool::Rustdoc { host })
-+ pub fn rustdoc(&self, compiler: Compiler) -> PathBuf {
-+ self.ensure(tool::Rustdoc { compiler })
- }
-
-- pub fn rustdoc_cmd(&self, host: Interned<String>) -> Command {
-+ pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command {
- let mut cmd = Command::new(&self.out.join("bootstrap/debug/rustdoc"));
-- let compiler = self.compiler(self.top_stage, host);
- cmd.env("RUSTC_STAGE", compiler.stage.to_string())
- .env("RUSTC_SYSROOT", self.sysroot(compiler))
- // Note that this is *not* the sysroot_libdir because rustdoc must be linked
- // equivalently to rustc.
- .env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler))
- .env("CFG_RELEASE_CHANNEL", &self.config.channel)
-- .env("RUSTDOC_REAL", self.rustdoc(host))
-+ .env("RUSTDOC_REAL", self.rustdoc(compiler))
- .env("RUSTDOC_CRATE_VERSION", self.rust_version())
- .env("RUSTC_BOOTSTRAP", "1");
-
-@@ -689,7 +688,7 @@ impl<'a> Builder<'a> {
- cmd.env_remove("MAKEFLAGS");
- cmd.env_remove("MFLAGS");
-
-- if let Some(linker) = self.linker(host) {
-+ if let Some(linker) = self.linker(compiler.host) {
- cmd.env("RUSTC_TARGET_LINKER", linker);
- }
- cmd
-@@ -751,7 +750,7 @@ impl<'a> Builder<'a> {
- // This is the intended out directory for compiler documentation.
- my_out = self.compiler_doc_out(target);
- }
-- let rustdoc = self.rustdoc(compiler.host);
-+ let rustdoc = self.rustdoc(compiler);
- self.clear_if_dirty(&my_out, &rustdoc);
- } else if cmd != "test" {
- match mode {
-@@ -897,7 +896,7 @@ impl<'a> Builder<'a> {
- .env(
- "RUSTDOC_REAL",
- if cmd == "doc" || cmd == "rustdoc" || (cmd == "test" && want_rustdoc) {
-- self.rustdoc(compiler.host)
-+ self.rustdoc(compiler)
- } else {
- PathBuf::from("/path/to/nowhere/rustdoc/not/required")
- },
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index 2dae3f9135d8..3045cda125ee 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -479,7 +479,7 @@ impl Step for Rustc {
- t!(fs::create_dir_all(image.join("bin")));
- builder.cp_r(&src.join("bin"), &image.join("bin"));
-
-- builder.install(&builder.rustdoc(compiler.host), &image.join("bin"), 0o755);
-+ builder.install(&builder.rustdoc(compiler), &image.join("bin"), 0o755);
-
- // Copy runtime DLLs needed by the compiler
- if libdir != "bin" {
-diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
-index 621e3a95473e..ae329286486d 100644
---- a/src/bootstrap/doc.rs
-+++ b/src/bootstrap/doc.rs
-@@ -335,7 +335,7 @@ fn invoke_rustdoc(
- let footer = builder.src.join("src/doc/footer.inc");
- let version_info = out.join("version_info.html");
-
-- let mut cmd = builder.rustdoc_cmd(compiler.host);
-+ let mut cmd = builder.rustdoc_cmd(compiler);
-
- let out = out.join("book");
-
-@@ -415,7 +415,7 @@ impl Step for Standalone {
- }
-
- let html = out.join(filename).with_extension("html");
-- let rustdoc = builder.rustdoc(compiler.host);
-+ let rustdoc = builder.rustdoc(compiler);
- if up_to_date(&path, &html) &&
- up_to_date(&footer, &html) &&
- up_to_date(&favicon, &html) &&
-@@ -425,7 +425,7 @@ impl Step for Standalone {
- continue
- }
-
-- let mut cmd = builder.rustdoc_cmd(compiler.host);
-+ let mut cmd = builder.rustdoc_cmd(compiler);
- cmd.arg("--html-after-content").arg(&footer)
- .arg("--html-before-content").arg(&version_info)
- .arg("--html-in-header").arg(&favicon)
-@@ -824,7 +824,7 @@ impl Step for Rustdoc {
- builder.ensure(Rustc { stage, target });
-
- // Build rustdoc.
-- builder.ensure(tool::Rustdoc { host: compiler.host });
-+ builder.ensure(tool::Rustdoc { compiler: compiler });
-
- // Symlink compiler docs to the output directory of rustdoc documentation.
- let out_dir = builder.stage_out(compiler, Mode::ToolRustc)
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index 5abf9d699784..6b9960c355c5 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -177,7 +177,7 @@ impl Step for Cargotest {
- cmd.arg(&builder.initial_cargo)
- .arg(&out_dir)
- .env("RUSTC", builder.rustc(compiler))
-- .env("RUSTDOC", builder.rustdoc(compiler.host)),
-+ .env("RUSTDOC", builder.rustdoc(compiler)),
- );
- }
- }
-@@ -560,7 +560,7 @@ impl Step for RustdocTheme {
- builder.sysroot_libdir(self.compiler, self.compiler.host),
- )
- .env("CFG_RELEASE_CHANNEL", &builder.config.channel)
-- .env("RUSTDOC_REAL", builder.rustdoc(self.compiler.host))
-+ .env("RUSTDOC_REAL", builder.rustdoc(self.compiler))
- .env("RUSTDOC_CRATE_VERSION", builder.rust_version())
- .env("RUSTC_BOOTSTRAP", "1");
- if let Some(linker) = builder.linker(self.compiler.host) {
-@@ -995,7 +995,7 @@ impl Step for Compiletest {
- || (mode == "ui" && is_rustdoc_ui)
- {
- cmd.arg("--rustdoc-path")
-- .arg(builder.rustdoc(compiler.host));
-+ .arg(builder.rustdoc(compiler));
- }
-
- cmd.arg("--src-base")
-@@ -1451,7 +1451,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
- }
-
- builder.info(&format!("doc tests for: {}", markdown.display()));
-- let mut cmd = builder.rustdoc_cmd(compiler.host);
-+ let mut cmd = builder.rustdoc_cmd(compiler);
- builder.add_rust_test_threads(&mut cmd);
- cmd.arg("--test");
- cmd.arg(markdown);
-diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
-index 4f2aa0b795dc..5fb83caac06c 100644
---- a/src/bootstrap/tool.rs
-+++ b/src/bootstrap/tool.rs
-@@ -430,7 +430,9 @@ impl Step for RemoteTestServer {
-
- #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
- pub struct Rustdoc {
-- pub host: Interned<String>,
-+ /// This should only ever be 0 or 2.
-+ /// We sometimes want to reference the "bootstrap" rustdoc, which is why this option is here.
-+ pub compiler: Compiler,
- }
-
- impl Step for Rustdoc {
-@@ -444,12 +446,12 @@ impl Step for Rustdoc {
-
- fn make_run(run: RunConfig<'_>) {
- run.builder.ensure(Rustdoc {
-- host: run.host,
-+ compiler: run.builder.compiler(run.builder.top_stage, run.host),
- });
- }
-
- fn run(self, builder: &Builder<'_>) -> PathBuf {
-- let target_compiler = builder.compiler(builder.top_stage, self.host);
-+ let target_compiler = self.compiler;
- if target_compiler.stage == 0 {
- if !target_compiler.is_snapshot(builder) {
- panic!("rustdoc in stage 0 must be snapshot rustdoc");
+++ /dev/null
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-
-inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
- betaver=${PV//*beta}
- BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
- MY_P="rustc-beta"
- SLOT="beta/${PV}"
- SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
- ABI_VER="$(ver_cut 1-2)"
- SLOT="stable/${ABI_VER}"
- MY_P="rustc-${PV}"
- SRC="${MY_P}-src.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
- $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
- NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 9.
-# 3. Specify LLVM_MAX_SLOT, e.g. 8.
-LLVM_DEPEND="
- || (
- sys-devel/llvm:8[llvm_targets_WebAssembly?]
- )
- <sys-devel/llvm-9:=
-"
-LLVM_MAX_SLOT=8
-
-COMMON_DEPEND="
- sys-libs/zlib
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-libs/libssh2
- net-libs/http-parser:=
- net-misc/curl[ssl]
- system-llvm? (
- ${LLVM_DEPEND}
- )
-"
-
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- || (
- >=sys-devel/gcc-4.7
- >=sys-devel/clang-3.5
- )
- dev-util/cmake"
-RDEPEND="${COMMON_DEPEND}
- >=app-eselect/eselect-rust-20190311
- !dev-util/cargo
- rustfmt? ( !dev-util/rustfmt )"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
- wasm? ( llvm_targets_WebAssembly )
- x86? ( cpu_flags_x86_sse2 )
-"
-
-PATCHES=(
- "${FILESDIR}"/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
- "${FILESDIR}"/1.34.0-doc-build-fix.patch
- "${FILESDIR}"/1.34.0-libressl.patch # bug 684224
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
- usex "$1" true false
-}
-
-pre_build_checks() {
- CHECKREQS_DISK_BUILD="7G"
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- CHECKREQS_DISK_BUILD="10G"
- fi
- eshopts_pop
- check-reqs_pkg_setup
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
- python-any-r1_pkg_setup
- use system-llvm && llvm_pkg_setup
-}
-
-src_prepare() {
- local rust_stage0_root="${WORKDIR}"/rust-stage0
-
- local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
-
- "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
- # ugly hack for https://bugs.gentoo.org/679806
- if use ppc64; then
- sed -i 's/getentropy/gEtEnTrOpY/g' "${rust_stage0_root}"/bin/cargo || die
- export OPENSSL_ppccap=0
- fi
-
- default
-}
-
-src_configure() {
- local rust_target="" rust_targets="" arch_cflags
-
- # Collect rust target names to compile standard libs for all ABIs.
- for v in $(multilib_get_enabled_abi_pairs); do
- rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
- done
- if use wasm; then
- rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
- fi
- rust_targets="${rust_targets#,}"
-
- local extended="true" tools="\"cargo\","
- if use clippy; then
- tools="\"clippy\",$tools"
- fi
- if use rls; then
- tools="\"rls\",\"analysis\",\"src\",$tools"
- fi
- if use rustfmt; then
- tools="\"rustfmt\",$tools"
- fi
-
- local rust_stage0_root="${WORKDIR}"/rust-stage0
-
- rust_target="$(rust_abi)"
-
- cat <<- EOF > "${S}"/config.toml
- [llvm]
- optimize = $(toml_usex !debug)
- release-debuginfo = $(toml_usex debug)
- assertions = $(toml_usex debug)
- targets = "${LLVM_TARGETS// /;}"
- experimental-targets = ""
- link-shared = $(toml_usex system-llvm)
- [build]
- build = "${rust_target}"
- host = ["${rust_target}"]
- target = [${rust_targets}]
- cargo = "${rust_stage0_root}/bin/cargo"
- rustc = "${rust_stage0_root}/bin/rustc"
- docs = $(toml_usex doc)
- submodules = false
- python = "${EPYTHON}"
- locked-deps = true
- vendor = true
- extended = ${extended}
- tools = [${tools}]
- [install]
- prefix = "${EPREFIX}/usr"
- libdir = "$(get_libdir)/${P}"
- docdir = "share/doc/${P}"
- mandir = "share/${P}/man"
- [rust]
- optimize = $(toml_usex !debug)
- debuginfo = $(toml_usex debug)
- debug-assertions = $(toml_usex debug)
- default-linker = "$(tc-getCC)"
- channel = "stable"
- rpath = false
- lld = $(toml_usex wasm)
- EOF
-
- for v in $(multilib_get_enabled_abi_pairs); do
- rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
- arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
- cat <<- EOF >> "${S}"/config.env
- CFLAGS_${rust_target}=${arch_cflags}
- EOF
-
- cat <<- EOF >> "${S}"/config.toml
- [target.${rust_target}]
- cc = "$(tc-getBUILD_CC)"
- cxx = "$(tc-getBUILD_CXX)"
- linker = "$(tc-getCC)"
- ar = "$(tc-getAR)"
- EOF
- if use system-llvm; then
- cat <<- EOF >> "${S}"/config.toml
- llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
- EOF
- fi
- done
-
- if use wasm; then
- cat <<- EOF >> "${S}"/config.toml
- [target.wasm32-unknown-unknown]
- linker = "rust-lld"
- EOF
- fi
-}
-
-src_compile() {
- env $(cat "${S}"/config.env)\
- "${EPYTHON}" ./x.py build -v --config="${S}"/config.toml -j$(makeopts_jobs) \
- --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
- local rust_target abi_libdir
-
- env DESTDIR="${D}" "${EPYTHON}" ./x.py install -v || die
-
- mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
- mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
- mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
- mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
- mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
- mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
- if use clippy; then
- mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
- mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
- fi
- if use rls; then
- mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
- fi
- if use rustfmt; then
- mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
- mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
- fi
-
- # Copy shared library versions of standard libraries for all targets
- # into the system's abi-dependent lib directories because the rust
- # installer only does so for the native ABI.
- for v in $(multilib_get_enabled_abi_pairs); do
- if [ ${v##*.} = ${DEFAULT_ABI} ]; then
- continue
- fi
- abi_libdir=$(get_abi_LIBDIR ${v##*.})
- rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
- mkdir -p "${ED}/usr/${abi_libdir}"
- cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
- "${ED}/usr/${abi_libdir}" || die
- done
-
- # temp fix for https://bugs.gentoo.org/672816
- # FIXME: this should handle libdir=lib, not exact arches
- if { use x86 || use arm; }; then
- local rust_target wrongdir rightdir
- rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
- wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends"
- rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends"
- if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then
- einfo "fixing bug #672816"
- mv "${wrongdir}" "${rightdir}" || die
- rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
- fi
- fi # end temp fix
-
- dodoc COPYRIGHT
-
- # FIXME:
- # Really not sure if that env is needed, specailly LDPATH
- cat <<-EOF > "${T}"/50${P}
- LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}"
- MANPATH="${EPREFIX}/usr/share/${P}/man"
- EOF
- doenvd "${T}"/50${P}
-
- # note: eselect-rust adds EROOT to all paths below
- cat <<-EOF > "${T}/provider-${P}"
- /usr/bin/rustdoc
- /usr/bin/rust-gdb
- /usr/bin/rust-gdbgui
- /usr/bin/rust-lldb
- EOF
- echo /usr/bin/cargo >> "${T}/provider-${P}"
- if use clippy; then
- echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
- echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
- fi
- if use rls; then
- echo /usr/bin/rls >> "${T}/provider-${P}"
- fi
- if use rustfmt; then
- echo /usr/bin/rustfmt >> "${T}/provider-${P}"
- echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
- fi
- dodir /etc/env.d/rust
- insinto /etc/env.d/rust
- doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
- eselect rust update --if-unset
-
- elog "Rust installs a helper script for calling GDB and LLDB,"
- elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
- ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
- ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
- ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
-
- if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
- elog "install app-emacs/rust-mode to get emacs support for rust."
- fi
-
- if has_version app-editors/gvim || has_version app-editors/vim; then
- elog "install app-vim/rust-vim to get vim support for rust."
- fi
-
- if has_version 'app-shells/zsh'; then
- elog "install app-shells/rust-zshcomp to get zsh completion for rust."
- fi
-}
-
-pkg_postrm() {
- eselect rust unset --if-invalid
-}
projects / gentoo.git / commitdiff