575 lines
23 KiB
Plaintext
575 lines
23 KiB
Plaintext
From b6eb8a50d7a02ef39ace5c8eb63d25b6a0044b23 Mon Sep 17 00:00:00 2001
|
|
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
|
|
Date: Thu, 6 Jun 2019 23:35:35 +0200
|
|
Subject: Haiku-specific patches for Rust 1.34.2
|
|
|
|
|
|
diff --git a/Cargo.lock b/Cargo.lock
|
|
index e8bab07..ca03fc3 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -1280,7 +1280,7 @@ dependencies = [
|
|
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
- "libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
+ "libssh2-sys 0.2.11 (git+https://github.com/alexcrichton/ssh2-rs?rev=74d7f04)",
|
|
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
@@ -1298,7 +1298,7 @@ dependencies = [
|
|
[[package]]
|
|
name = "libssh2-sys"
|
|
version = "0.2.11"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+source = "git+https://github.com/alexcrichton/ssh2-rs?rev=74d7f04#74d7f04dbee9997510bdad5608bb06970c6b4c8a"
|
|
dependencies = [
|
|
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
@@ -2103,7 +2103,7 @@ name = "rand_chacha"
|
|
version = "0.1.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
@@ -2125,7 +2125,7 @@ name = "rand_hc"
|
|
version = "0.1.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
@@ -2150,7 +2150,7 @@ name = "rand_xorshift"
|
|
version = "0.1.0"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
dependencies = [
|
|
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
]
|
|
|
|
[[package]]
|
|
@@ -4071,7 +4071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd"
|
|
"checksum libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "48441cb35dc255da8ae72825689a95368bf510659ae1ad55dc4aa88cb1789bf1"
|
|
"checksum libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d75d7966bda4730b722d1eab8e668df445368a24394bae9fc1e8dc0ab3dbe4f4"
|
|
-"checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d"
|
|
+"checksum libssh2-sys 0.2.11 (git+https://github.com/alexcrichton/ssh2-rs?rev=74d7f04)" = "<none>"
|
|
"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
|
|
"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
|
|
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index cb3c0ee..1bb1bca 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -59,6 +59,7 @@ cargo = { path = "src/tools/cargo" }
|
|
# that we're shipping as well (to ensure that the rustfmt in RLS and the
|
|
# `rustfmt` executable are the same exact version).
|
|
rustfmt-nightly = { path = "src/tools/rustfmt" }
|
|
+libssh2-sys = { git = "https://github.com/alexcrichton/ssh2-rs", rev = "74d7f04" }
|
|
|
|
# See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on
|
|
# here
|
|
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
|
|
index a471af2..b0587ce 100644
|
|
--- a/src/bootstrap/builder.rs
|
|
+++ b/src/bootstrap/builder.rs
|
|
@@ -669,20 +669,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");
|
|
|
|
@@ -690,7 +689,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
|
|
@@ -752,7 +751,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 {
|
|
@@ -898,7 +897,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 2dae3f9..3045cda 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 f81c640..dceb8e6 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");
|
|
|
|
@@ -412,7 +412,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) &&
|
|
@@ -422,7 +422,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)
|
|
@@ -823,7 +823,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)
|
|
@@ -882,7 +882,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"));
|
|
index.arg(crate::channel::CFG_RELEASE_NUM);
|
|
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
|
|
index b7323b2..57995eb 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)),
|
|
);
|
|
}
|
|
}
|
|
@@ -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,
|
|
@@ -563,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) {
|
|
@@ -1042,7 +1039,7 @@ impl Step for Compiletest {
|
|
|| mode == "js-doc-test"
|
|
{
|
|
cmd.arg("--rustdoc-path")
|
|
- .arg(builder.rustdoc(compiler.host));
|
|
+ .arg(builder.rustdoc(compiler));
|
|
}
|
|
|
|
cmd.arg("--src-base")
|
|
@@ -1470,7 +1467,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)
|
|
@@ -1495,7 +1495,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 fc1a17d..5fb83ca 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,
|
|
@@ -398,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 {
|
|
@@ -412,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");
|
|
@@ -625,7 +659,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 +671,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))
|
|
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
|
|
index e022d3a..c1419ef 100644
|
|
--- a/src/librustc_driver/lib.rs
|
|
+++ b/src/librustc_driver/lib.rs
|
|
@@ -1445,9 +1445,14 @@ fn parse_crate_attrs<'a>(sess: &'a Session, input: &Input) -> PResult<'a, Vec<as
|
|
}
|
|
|
|
// Temporarily have stack size set to 32MB to deal with various crates with long method
|
|
-// chains or deep syntax trees.
|
|
+// chains or deep syntax trees, except when on Haiku
|
|
// FIXME(oli-obk): get https://github.com/rust-lang/rust/pull/55617 the finish line
|
|
-const STACK_SIZE: usize = 32 * 1024 * 1024; // 32MB
|
|
+
|
|
+#[cfg(not(target_os = "haiku"))]
|
|
+const STACK_SIZE: usize = 32 * 1024 * 1024;
|
|
+
|
|
+#[cfg(target_os = "haiku")]
|
|
+const STACK_SIZE: usize = 16 * 1024 * 1024;
|
|
|
|
/// Runs `f` in a suitable thread for running `rustc`; returns a `Result` with either the return
|
|
/// value of `f` or -- if a panic occurs -- the panic value.
|
|
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs
|
|
index e29557f..c2d4692 100644
|
|
--- a/src/libstd/sys/unix/thread.rs
|
|
+++ b/src/libstd/sys/unix/thread.rs
|
|
@@ -167,8 +167,7 @@ impl Thread {
|
|
unsafe {
|
|
let ret = libc::pthread_join(self.id, ptr::null_mut());
|
|
mem::forget(self);
|
|
- assert!(ret == 0,
|
|
- "failed to join thread: {}", io::Error::from_raw_os_error(ret));
|
|
+ debug_assert_eq!(ret, 0);
|
|
}
|
|
}
|
|
|
|
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs
|
|
index a78b599..04fe71d 100644
|
|
--- a/src/libstd/sys/windows/c.rs
|
|
+++ b/src/libstd/sys/windows/c.rs
|
|
@@ -267,7 +267,6 @@ pub const FILE_END: DWORD = 2;
|
|
|
|
pub const WAIT_OBJECT_0: DWORD = 0x00000000;
|
|
pub const WAIT_TIMEOUT: DWORD = 258;
|
|
-pub const WAIT_FAILED: DWORD = 0xFFFFFFFF;
|
|
|
|
#[cfg(target_env = "msvc")]
|
|
#[cfg(feature = "backtrace")]
|
|
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
|
|
index bd7cb67..695f2bf 100644
|
|
--- a/src/libstd/sys/windows/thread.rs
|
|
+++ b/src/libstd/sys/windows/thread.rs
|
|
@@ -58,11 +58,7 @@ impl Thread {
|
|
}
|
|
|
|
pub fn join(self) {
|
|
- let rc = unsafe { c::WaitForSingleObject(self.handle.raw(), c::INFINITE) };
|
|
- if rc == c::WAIT_FAILED {
|
|
- panic!("failed to join on thread: {}",
|
|
- io::Error::last_os_error());
|
|
- }
|
|
+ unsafe { c::WaitForSingleObject(self.handle.raw(), c::INFINITE); }
|
|
}
|
|
|
|
pub fn yield_now() {
|
|
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
|
|
index 438ea3a..67b0bf9 100644
|
|
--- a/src/libstd/thread/mod.rs
|
|
+++ b/src/libstd/thread/mod.rs
|
|
@@ -1432,11 +1432,6 @@ impl<T> JoinHandle<T> {
|
|
/// [`panic`]: ../../std/macro.panic.html
|
|
/// [atomic memory orderings]: ../../std/sync/atomic/index.html
|
|
///
|
|
- /// # Panics
|
|
- ///
|
|
- /// This function may panic on some platforms if a thread attempts to join
|
|
- /// itself or otherwise may create a deadlock with joining threads.
|
|
- ///
|
|
/// # Examples
|
|
///
|
|
/// ```
|
|
diff --git a/src/llvm-project/llvm/lib/Support/Unix/Signals.inc b/src/llvm-project/llvm/lib/Support/Unix/Signals.inc
|
|
index ad88d5e..9d320b7 100644
|
|
--- a/src/llvm-project/llvm/lib/Support/Unix/Signals.inc
|
|
+++ b/src/llvm-project/llvm/lib/Support/Unix/Signals.inc
|
|
@@ -47,7 +47,9 @@
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include <algorithm>
|
|
#include <string>
|
|
+#define _BSD_SOURCE
|
|
#include <sysexits.h>
|
|
+#undef _BSD_SOURCE
|
|
#ifdef HAVE_BACKTRACE
|
|
# include BACKTRACE_HEADER // For backtrace().
|
|
#endif
|
|
--
|
|
2.19.0
|
|
|