diff options
Diffstat (limited to 'lang/rust-nightly/files')
4 files changed, 48 insertions, 23 deletions
diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs index 6d7f6d612496..8953ab44bbf2 100644 --- a/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs +++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_build__steps_install.rs @@ -4,14 +4,16 @@ It otherwise wastes significant time (there are a lot of individual files) and stages host docs, wasm docs, which unstages the host docs first. ---- src/bootstrap/src/core/build_steps/install.rs.orig 2022-05-01 20:28:31 UTC +XXX: Shouldn't we instead just avoid adding docs-*-wasm* to _COMPONENTS in lang/rust/Makefile? + +--- src/bootstrap/src/core/build_steps/install.rs.orig 2025-08-24 19:46:17 UTC +++ src/bootstrap/src/core/build_steps/install.rs -@@ -138,7 +138,7 @@ macro_rules! install { +@@ -206,7 +206,7 @@ install!((self, builder, _config), } install!((self, builder, _config), -- Docs, path = "src/doc", _config.docs, only_hosts: false, { -+ Docs, path = "src/doc", _config.docs, only_hosts: true, { +- Docs, path = "src/doc", _config.docs, IS_HOST: false, { ++ Docs, path = "src/doc", _config.docs, IS_HOST: true, { let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs"); install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball); }; diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs index a556833eed1e..4b024680070c 100644 --- a/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs +++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_config_config.rs @@ -1,14 +1,14 @@ ---- src/bootstrap/src/core/config/config.rs.orig 2025-06-08 20:17:28 UTC +--- src/bootstrap/src/core/config/config.rs.orig 2025-08-24 19:46:17 UTC +++ src/bootstrap/src/core/config/config.rs -@@ -1459,9 +1459,9 @@ impl Config { - || source_version.minor == stage0_version.minor + 1))) - { - let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1); -- fail(&format!( -+ eprintln!( - "Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}" -- )); -+ ); - } +@@ -1991,9 +1991,9 @@ pub fn check_stage0_version( + || source_version.minor == stage0_version.minor + 1))) + { + let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1); +- fail(&format!( ++ eprintln!( + "Unexpected {component_name} version: {stage0_version}, we should use {prev_version}/{source_version} to build source with {source_version}" +- )); ++ ); } + } diff --git a/lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs b/lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs new file mode 100644 index 000000000000..9504f4a16f94 --- /dev/null +++ b/lang/rust-nightly/files/patch-src_bootstrap_src_core_sanity.rs @@ -0,0 +1,23 @@ +XXX: cc_tool is Gnu here because of patch-vendor_cc.rs. We need to seek need better solution. + +--- src/bootstrap/src/core/sanity.rs.orig 2025-09-06 18:37:35 UTC ++++ src/bootstrap/src/core/sanity.rs +@@ -338,12 +338,12 @@ than building it. + let cc_tool = build.cc_tool(*target); + if !cc_tool.is_like_clang() && !cc_tool.path().ends_with("emcc") { + // emcc works as well +- panic!( +- "Clang is required to build C code for Wasm targets, got `{}` instead\n\ +- this is because compiler-builtins is configured to build C source. Either \ +- ensure Clang is used, or adjust this configuration.", +- cc_tool.path().display() +- ); ++ //panic!( ++ // "Clang is required to build C code for Wasm targets, got `{}` instead\n\ ++ // this is because compiler-builtins is configured to build C source. Either \ ++ // ensure Clang is used, or adjust this configuration.", ++ // cc_tool.path().display() ++ //); + } + } + diff --git a/lang/rust-nightly/files/patch-vendor_cc.rs b/lang/rust-nightly/files/patch-vendor_cc.rs index 322854af170d..377f1a9346db 100644 --- a/lang/rust-nightly/files/patch-vendor_cc.rs +++ b/lang/rust-nightly/files/patch-vendor_cc.rs @@ -86,8 +86,8 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.23/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.23/src/tool.rs +--- vendor/cc-1.2.26/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.26/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -99,8 +99,8 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.25/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.25/src/tool.rs +--- vendor/cc-1.2.28/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.28/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -112,8 +112,8 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.26/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.26/src/tool.rs +--- vendor/cc-1.2.33/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.33/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { @@ -125,8 +125,8 @@ https://reviews.llvm.org/D77776 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu), (false, false, false, false, false) => { cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU"); ---- vendor/cc-1.2.29/src/tool.rs.orig 2025-04-01 18:22:03 UTC -+++ vendor/cc-1.2.29/src/tool.rs +--- vendor/cc-1.2.35/src/tool.rs.orig 2025-04-01 18:22:03 UTC ++++ vendor/cc-1.2.35/src/tool.rs @@ -141,9 +141,7 @@ impl Tool { match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) { |