Auto merge of #112049 - Kobzol:pgo-omit-benchmarks, r=<try>

[do not merge] CI experiments

Various CI experiments for try/dist builds.

r? `@ghost`

try-job: dist-x86_64-msvc

src/bootstrap/src/bin/rustc.rs

@@ -95,7 +95,6 @@ fn main() {
  // When statically linking `std` into `rustc_driver`, remove `-C prefer-dynamic`
  if env::var("RUSTC_LINK_STD_INTO_RUSTC_DRIVER").unwrap() == "1"
  && crate_name == Some("rustc_driver")
- && stage != "0"
  {
  if let Some(pos) = args.iter().enumerate().position(|(i, a)| {
  a == "-C" && args.get(i + 1).map(|a| a == "prefer-dynamic").unwrap_or(false)

src/bootstrap/src/core/build_steps/compile.rs

@@ -9,8 +9,8 @@
 use std::borrow::Cow;
 use std::collections::HashSet;
 use std::ffi::OsStr;
-use std::io::BufReader;
 use std::io::prelude::*;
+use std::io::BufReader;
 use std::path::{Path, PathBuf};
 use std::process::Stdio;
 use std::{env, fs, str};
@@ -22,14 +22,14 @@ use crate::core::build_steps::tool::SourceType;
 use crate::core::build_steps::{dist, llvm};
 use crate::core::builder;
 use crate::core::builder::{
- Builder, Cargo, Kind, PathSet, RunConfig, ShouldRun, Step, TaskPath, crate_description,
+ crate_description, Builder, Cargo, Kind, PathSet, RunConfig, ShouldRun, Step, TaskPath,
 };
 use crate::core::config::{DebuginfoLevel, LlvmLibunwind, RustcLto, TargetSelection};
 use crate::utils::exec::command;
 use crate::utils::helpers::{
  self, exe, get_clang_cl_resource_dir, is_debug_info, is_dylib, symlink_dir, t, up_to_date,
 };
-use crate::{CLang, Compiler, DependencyType, GitRepo, LLVM_TOOLS, Mode};
+use crate::{CLang, Compiler, DependencyType, GitRepo, Mode, LLVM_TOOLS};
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Std {
@@ -1926,6 +1926,7 @@ impl Step for Assemble {
  if (is_dylib(&filename) || is_debug_info(&filename)) && !proc_macros.contains(&filename)
  {
  builder.copy_link(&f.path(), &rustc_libdir.join(&filename));
+ println!("[BOOTSTRAP COPY] {filename}");
  }
  }
 

src/ci/github-actions/jobs.yml

@@ -72,7 +72,7 @@ envs:
  # - not running `opt-dist`'s post-optimization smoke tests on the resulting toolchain
  #
  # If you *want* these to happen however, temporarily uncomment it before triggering a try build.
- DIST_TRY_BUILD: 1
+ #  DIST_TRY_BUILD: 1
 
  auto:
  <<: *production

tests/ui/command/command-current-dir.rs

@@ -1,4 +1,5 @@
 //@ run-pass
+//@ no-prefer-dynamic We move the binary around, so do not depend dynamically on libstd
 //@ ignore-wasm32 no processes
 //@ ignore-sgx no processes
 //@ ignore-fuchsia Needs directory creation privilege