Rust 1.87.0 + enable build also for Solaris CBE 11.4.81

Author: psumbera

README.md

@@ -7,7 +7,7 @@ Note that to build Rust version X you need to have version X or X-1 versoin.
 Usage example:
 
 ```
-RUST_BOOTSTRAP=~/.rust_solaris/rustc-1.85.0/bin ./build.sh
+RUST_BOOTSTRAP=~/.rust_solaris/rustc-1.86.0/bin ./build.sh
 ```
 
 Ultimately Rust should install in standard manner (rustup). But we are not there yet..

build.sh

@@ -4,7 +4,7 @@
 #
 set -xe
 
-VERSION=1.86.0
+VERSION=1.87.0
 
 PATH=$RUST_BOOTSTRAP:/usr/gnu/bin:/usr/bin
 
@@ -21,8 +21,14 @@ SRC_ARCHIVE=${SRC_DIR}.tar.xz
 BUILD_HOME="$BUILD_DIR"/rustc-${VERSION}-home
 PROTO_DIR="$BUILD_DIR"/rustc-${VERSION}-proto
 
-GCC=/usr/gcc/11/bin/gcc
-GXX=/usr/gcc/11/bin/g++
+SRU=$(uname -v | cut -d . -f 3)
+if [ $SRU -ge 78 ]; then
+  GCC=/usr/gcc/14/bin/gcc
+  GXX=/usr/gcc/14/bin/g++
+else
+  GCC=/usr/gcc/11/bin/gcc
+  GXX=/usr/gcc/11/bin/g++
+fi
 
 mkdir -p "$BUILD_DIR"
 
@@ -61,4 +67,4 @@ PATH="$PATH" CC=$GCC CXX=$GXX bash ./configure ${CONFIGURE_OPTIONS}
 PATH=$PATH PKG_CONFIG_PATH=/usr/lib/64/pkgconfig HOME=$BUILD_HOME gmake install DESTDIR=$PROTO_DIR
 
 # Create Rust distribution archive
-( cd $PROTO_DIR/usr && mv local rustc-${VERSION} && gtar cfJ $BUILD_DIR/rust-${VERSION}-Solaris-11.4.42-CBE-`mach`.tar.xz rustc-${VERSION} )
+( cd $PROTO_DIR/usr && mv local rustc-${VERSION} && gtar cfJ $BUILD_DIR/rust-${VERSION}-Solaris-11.4.$SRU-CBE-`mach`.tar.xz rustc-${VERSION} )

patches/curl.patch

@@ -0,0 +1,13 @@
+https://github.com/rust-lang/cargo/pull/15532
+
+--- rustc-1.87.0-src/src/tools/cargo/src/cargo/util/context/mod.rs
++++ rustc-1.87.0-src/src/tools/cargo/src/cargo/util/context/mod.rs
+@@ -3111,7 +3111,7 @@
+     use crate::util::network;
+ 
+     if network::proxy::http_proxy_exists(http, gctx) && http.multiplexing.is_none() {
+-        let bad_curl_versions = ["7.87.0", "7.88.0", "7.88.1"];
++        let bad_curl_versions = ["7.79.0", "7.87.0", "7.88.0", "7.88.1"];
+         if bad_curl_versions
+             .iter()
+             .any(|v| curl_version.starts_with(v))

patches/no-fd-lock.patch

@@ -6,7 +6,7 @@ diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
 index fcd97b7b589..ff404a80825 100644
 --- a/src/bootstrap/Cargo.toml
 +++ b/src/bootstrap/Cargo.toml
-@@ -43,7 +43,6 @@ cmake = "=0.1.48"
+@@ -38,7 +38,6 @@
  build_helper = { path = "../build_helper" }
  clap = { version = "4.4", default-features = false, features = ["std", "usage", "help", "derive", "error-context"] }
  clap_complete = "4.4"
@@ -38,9 +38,9 @@ index 409a644b9be..d331411f230 100644
 +use std::{env};
 
  use bootstrap::{
-     Build, CONFIG_CHANGE_HISTORY, Config, Flags, Subcommand, find_recent_config_change_ids,
-@@ -36,41 +36,6 @@ fn main() {
-     let flags = Flags::parse(&args);
+     Build, CONFIG_CHANGE_HISTORY, ChangeId, Config, Flags, Subcommand, debug,
+@@ -33,41 +33,6 @@
+     debug!("parsing config based on flags");
      let config = Config::parse(flags);
 
 -    let mut build_lock;
@@ -79,5 +79,5 @@ index 409a644b9be..d331411f230 100644
 -    }
 -
      // check_version warnings are not printed during setup, or during CI
-     let changelog_suggestion = if matches!(config.cmd, Subcommand::Setup { .. }) || CiEnv::is_ci() {
-         None
+     let changelog_suggestion = if matches!(config.cmd, Subcommand::Setup { .. })
+         || config.is_running_on_ci