Auto merge of #156971 - sgasho:playground-dynamic-linking-llvm-test-2, r=<try>

bors · bors · commit 2697c4e3ccfd · 2026-05-30T07:18:43.000Z
aarch64-apple-distcheck: symlink LLVM dylib


try-job: aarch64-apple-distcheck-ci-llvm
diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs
@@ -411,6 +411,16 @@ fn main() {
             continue;
         }
 
+        // On apple-darwin, llvm-config reports the versioned shared library name such as LLVM-22-..., but
+        // the distributed toolchain ships libLLVM.dylib. Normalize the link name here.
+        let name =
+            if target.contains("apple-darwin") && llvm_kind == "dylib" && name.starts_with("LLVM-")
+            {
+                "LLVM"
+            } else {
+                name
+            };
+
         let kind = if name.starts_with("LLVM") {
             llvm_kind
         } else if is_static {
diff --git a/compiler/rustc_metadata/src/native_libs.rs b/compiler/rustc_metadata/src/native_libs.rs
@@ -62,12 +62,15 @@ pub fn walk_native_lib_search_dirs<R>(
         f(&sess.target_tlib_path.dir.join("self-contained"), false)?;
     }
 
+    let has_shared_llvm_apple_darwin =
+        sess.target.is_like_darwin && sess.target_tlib_path.dir.join("libLLVM.dylib").exists();
+
     // Toolchains for some targets may ship `libunwind.a`, but place it into the main sysroot
     // library directory instead of the self-contained directories.
     // Sanitizer libraries have the same issue and are also linked by name on Apple targets.
     // The targets here should be in sync with `copy_third_party_objects` in bootstrap.
-    // Finally there is shared LLVM library, which unlike compiler libraries, is linked by the name,
-    // therefore requiring the search path for the linker.
+    // On Apple targets, shared LLVM is linked by name, so when `libLLVM.dylib` is
+    // present in the target libdir, add that directory to the linker search path.
     // FIXME: implement `-Clink-self-contained=+/-unwind,+/-sanitizers`, move the shipped libunwind
     // and sanitizers to self-contained directory, and stop adding this search path.
     // FIXME: On AIX this also has the side-effect of making the list of library search paths
@@ -77,7 +80,8 @@ pub fn walk_native_lib_search_dirs<R>(
         || sess.target.os == Os::Linux
         || sess.target.os == Os::Fuchsia
         || sess.target.is_like_aix
-        || sess.target.is_like_darwin && !sess.sanitizers().is_empty()
+        || sess.target.is_like_darwin
+            && (!sess.sanitizers().is_empty() || has_shared_llvm_apple_darwin)
         || sess.target.os == Os::Windows
             && sess.target.env == Env::Gnu
             && sess.target.cfg_abi == CfgAbi::Llvm
diff --git a/src/bootstrap/download-ci-llvm-stamp b/src/bootstrap/download-ci-llvm-stamp
@@ -1,4 +1,4 @@
 Change this file to make users of the `download-ci-llvm` configuration download
 a new version of LLVM from CI, even if the LLVM submodule hasn’t changed.
 
-Last change is for: https://github.com/rust-lang/rust/pull/154485
+Last change is for: https://github.com/rust-lang/rust/pull/156880
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
@@ -2513,6 +2513,25 @@ fn maybe_install_llvm(
         let llvm_dylib_path = src_libdir.join("libLLVM.dylib");
         if llvm_dylib_path.exists() {
             builder.install(&llvm_dylib_path, dst_libdir, FileType::NativeLibrary);
+
+            if install_symlink && let Some(llvm_config_path) = &builder.llvm_config(target) {
+                let major = llvm::get_llvm_version_major(builder, llvm_config_path);
+                let versioned_name = match &builder.config.llvm_version_suffix {
+                    Some(version_suffix) => format!("libLLVM-{major}{version_suffix}.dylib"),
+                    None => {
+                        // same logic as ./llvm.rs
+                        if builder.config.channel == "dev" {
+                            format!("libLLVM-{major}-rust-dev.dylib")
+                        } else {
+                            format!(
+                                "libLLVM-{major}-rust-{}-{}.dylib",
+                                builder.version, builder.config.channel
+                            )
+                        }
+                    }
+                };
+                t!(builder.symlink_file("libLLVM.dylib", dst_libdir.join(versioned_name)));
+            }
         }
         !builder.config.dry_run()
     } else if let llvm::LlvmBuildStatus::AlreadyBuilt(llvm::LlvmResult {
@@ -2858,7 +2877,8 @@ impl Step for RustDev {
         if src_bindir.exists() {
             for entry in walkdir::WalkDir::new(&src_bindir) {
                 let entry = t!(entry);
-                if entry.file_type().is_file() && !entry.path_is_symlink() {
+                //if entry.file_type().is_file() && !entry.path_is_symlink() {
+                if entry.path().is_file() {
                     let name = entry.file_name().to_str().unwrap();
                     tarball.add_file(src_bindir.join(name), "bin", FileType::Executable);
                 }
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
@@ -3467,101 +3467,161 @@ impl Step for Distcheck {
         // local source code, built artifacts or configuration by accident
         let root_dir = std::env::temp_dir().join("distcheck");
 
-        distcheck_plain_source_tarball(builder, &root_dir.join("distcheck-rustc-src"));
-        distcheck_rust_src(builder, &root_dir.join("distcheck-rust-src"));
-        distcheck_rustc_dev(builder, &root_dir.join("distcheck-rustc-dev"));
+        distcheck_rust_dev_ci_llvm(builder, &root_dir.join("distcheck_rust_dev"));
+        // distcheck_plain_source_tarball(builder, &root_dir.join("distcheck-rustc-src"));
+        // distcheck_rust_src(builder, &root_dir.join("distcheck-rust-src"));
+        // distcheck_rustc_dev(builder, &root_dir.join("distcheck-rustc-dev"));
     }
 }
 
-/// Check that we can build some basic things from the plain source tarball
-fn distcheck_plain_source_tarball(builder: &Builder<'_>, plain_src_dir: &Path) {
-    builder.info("Distcheck plain source tarball");
-    let plain_src_tarball = builder.ensure(dist::PlainSourceTarball);
-    builder.clear_dir(plain_src_dir);
+fn distcheck_rust_dev_ci_llvm(builder: &Builder<'_>, dir: &Path) {
+    builder.info("Distcheck rust dev");
+    let Some(rust_dev) = builder.ensure(dist::RustDev { target: builder.host_target }) else {
+        return;
+    };
+    builder.clear_dir(dir);
 
-    let configure_args: Vec<String> = std::env::var("DISTCHECK_CONFIGURE_ARGS")
-        .map(|args| args.split(" ").map(|s| s.to_string()).collect::<Vec<String>>())
-        .unwrap_or_default();
+    let ci_llvm_dir = dir.join("ci-llvm");
+    builder.clear_dir(&ci_llvm_dir);
 
     command("tar")
         .arg("-xf")
-        .arg(plain_src_tarball.tarball())
+        .arg(rust_dev.tarball())
         .arg("--strip-components=1")
-        .current_dir(plain_src_dir)
-        .run(builder);
-    command("./configure")
-        .arg("--set")
-        .arg("rust.omit-git-hash=false")
-        .arg("--set")
-        .arg("rust.remap-debuginfo=false")
-        .args(&configure_args)
-        .arg("--enable-vendor")
-        .current_dir(plain_src_dir)
-        .run(builder);
-    command(helpers::make(&builder.config.host_target.triple))
-        .arg("check")
-        // Do not run the build as if we were in CI, otherwise git would be assumed to be
-        // present, but we build from a tarball here
-        .env("GITHUB_ACTIONS", "0")
-        .current_dir(plain_src_dir)
+        .current_dir(&ci_llvm_dir)
         .run(builder);
-    // Mitigate pressure on small-capacity disks.
-    builder.remove_dir(plain_src_dir);
-}
 
-/// Check that rust-src has all of libstd's dependencies
-fn distcheck_rust_src(builder: &Builder<'_>, src_dir: &Path) {
-    builder.info("Distcheck rust-src");
-    let src_tarball = builder.ensure(dist::Src);
-    builder.clear_dir(src_dir);
+    let llvm_config = ci_llvm_dir
+        .join("rust-dev")
+        .join("bin")
+        .join(helpers::exe("llvm-config", builder.host_target));
+
+    let plain_source_dir = dir.join("plain_source_dir");
+    let plain_src_tarball = builder.ensure(dist::PlainSourceTarball);
+    builder.clear_dir(&plain_source_dir);
 
     command("tar")
         .arg("-xf")
-        .arg(src_tarball.tarball())
+        .arg(plain_src_tarball.tarball())
         .arg("--strip-components=1")
-        .current_dir(src_dir)
+        .current_dir(&plain_source_dir)
         .run(builder);
 
-    let toml = src_dir.join("rust-src/lib/rustlib/src/rust/library/std/Cargo.toml");
-    command(&builder.initial_cargo)
-        // Will read the libstd Cargo.toml
-        // which uses the unstable `public-dependency` feature.
-        .env("RUSTC_BOOTSTRAP", "1")
-        .arg("generate-lockfile")
-        .arg("--manifest-path")
-        .arg(&toml)
-        .current_dir(src_dir)
+    command("./configure")
+        .arg("--set")
+        .arg("rust.omit-git-hash=false")
+        .arg("--set")
+        .arg("rust.remap-debuginfo=false")
+        .arg("--set")
+        .arg(format!("target.{}.llvm-config={}", builder.host_target.triple, llvm_config.display()))
+        .arg("--set")
+        .arg("llvm.link-shared=true")
+        .arg("--enable-vendor")
+        .current_dir(&plain_source_dir)
         .run(builder);
-    // Mitigate pressure on small-capacity disks.
-    builder.remove_dir(src_dir);
-}
 
-/// Check that rustc-dev's compiler crate source code can be loaded with `cargo metadata`
-fn distcheck_rustc_dev(builder: &Builder<'_>, dir: &Path) {
-    builder.info("Distcheck rustc-dev");
-    let tarball = builder.ensure(dist::RustcDev::new(builder, builder.host_target)).unwrap();
-    builder.clear_dir(dir);
+    let llvm_lib_dir = ci_llvm_dir.join("rust-dev").join("lib");
+    let llvm_rpath = format!("-Clink-arg=-Wl,-rpath,{}", llvm_lib_dir.display());
 
-    command("tar")
-        .arg("-xf")
-        .arg(tarball.tarball())
-        .arg("--strip-components=1")
-        .current_dir(dir)
+    command("./x.py")
+        .arg("build")
+        .arg("library")
+        .env("RUSTFLAGS_BOOTSTRAP", llvm_rpath)
+        .current_dir(&plain_source_dir)
         .run(builder);
 
-    command(&builder.initial_cargo)
-        .arg("metadata")
-        .arg("--manifest-path")
-        .arg("rustc-dev/lib/rustlib/rustc-src/rust/compiler/rustc/Cargo.toml")
-        .env("RUSTC_BOOTSTRAP", "1")
-        // We might not have a globally available `rustc` binary on CI
-        .env("RUSTC", &builder.initial_rustc)
-        .current_dir(dir)
-        .run(builder);
-    // Mitigate pressure on small-capacity disks.
     builder.remove_dir(dir);
 }
 
+// /// Check that we can build some basic things from the plain source tarball
+// fn distcheck_plain_source_tarball(builder: &Builder<'_>, plain_src_dir: &Path) {
+//     builder.info("Distcheck plain source tarball");
+//     let plain_src_tarball = builder.ensure(dist::PlainSourceTarball);
+//     builder.clear_dir(plain_src_dir);
+
+//     let configure_args: Vec<String> = std::env::var("DISTCHECK_CONFIGURE_ARGS")
+//         .map(|args| args.split(" ").map(|s| s.to_string()).collect::<Vec<String>>())
+//         .unwrap_or_default();
+
+//     command("tar")
+//         .arg("-xf")
+//         .arg(plain_src_tarball.tarball())
+//         .arg("--strip-components=1")
+//         .current_dir(plain_src_dir)
+//         .run(builder);
+//     command("./configure")
+//         .arg("--set")
+//         .arg("rust.omit-git-hash=false")
+//         .arg("--set")
+//         .arg("rust.remap-debuginfo=false")
+//         .args(&configure_args)
+//         .arg("--enable-vendor")
+//         .current_dir(plain_src_dir)
+//         .run(builder);
+//     command(helpers::make(&builder.config.host_target.triple))
+//         .arg("check")
+//         // Do not run the build as if we were in CI, otherwise git would be assumed to be
+//         // present, but we build from a tarball here
+//         .env("GITHUB_ACTIONS", "0")
+//         .current_dir(plain_src_dir)
+//         .run(builder);
+//     // Mitigate pressure on small-capacity disks.
+//     builder.remove_dir(plain_src_dir);
+// }
+
+// /// Check that rust-src has all of libstd's dependencies
+// fn distcheck_rust_src(builder: &Builder<'_>, src_dir: &Path) {
+//     builder.info("Distcheck rust-src");
+//     let src_tarball = builder.ensure(dist::Src);
+//     builder.clear_dir(src_dir);
+
+//     command("tar")
+//         .arg("-xf")
+//         .arg(src_tarball.tarball())
+//         .arg("--strip-components=1")
+//         .current_dir(src_dir)
+//         .run(builder);
+
+//     let toml = src_dir.join("rust-src/lib/rustlib/src/rust/library/std/Cargo.toml");
+//     command(&builder.initial_cargo)
+//         // Will read the libstd Cargo.toml
+//         // which uses the unstable `public-dependency` feature.
+//         .env("RUSTC_BOOTSTRAP", "1")
+//         .arg("generate-lockfile")
+//         .arg("--manifest-path")
+//         .arg(&toml)
+//         .current_dir(src_dir)
+//         .run(builder);
+//     // Mitigate pressure on small-capacity disks.
+//     builder.remove_dir(src_dir);
+// }
+
+// /// Check that rustc-dev's compiler crate source code can be loaded with `cargo metadata`
+// fn distcheck_rustc_dev(builder: &Builder<'_>, dir: &Path) {
+//     builder.info("Distcheck rustc-dev");
+//     let tarball = builder.ensure(dist::RustcDev::new(builder, builder.host_target)).unwrap();
+//     builder.clear_dir(dir);
+
+//     command("tar")
+//         .arg("-xf")
+//         .arg(tarball.tarball())
+//         .arg("--strip-components=1")
+//         .current_dir(dir)
+//         .run(builder);
+
+//     command(&builder.initial_cargo)
+//         .arg("metadata")
+//         .arg("--manifest-path")
+//         .arg("rustc-dev/lib/rustlib/rustc-src/rust/compiler/rustc/Cargo.toml")
+//         .env("RUSTC_BOOTSTRAP", "1")
+//         // We might not have a globally available `rustc` binary on CI
+//         .env("RUSTC", &builder.initial_rustc)
+//         .current_dir(dir)
+//         .run(builder);
+//     // Mitigate pressure on small-capacity disks.
+//     builder.remove_dir(dir);
+// }
+
 /// Runs unit tests in `bootstrap_test.py`, which test the Python parts of bootstrap.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct BootstrapPy;
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
@@ -285,6 +285,7 @@ pub fn is_valid_test_suite_arg<'a, P: AsRef<Path>>(
     }
 }
 
+#[allow(dead_code)]
 pub fn make(host: &str) -> PathBuf {
     if host.contains("dragonfly")
         || host.contains("freebsd")
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
@@ -526,6 +526,7 @@ auto:
         --enable-sanitizers
         --enable-profiler
         --set rust.jemalloc
+        --set llvm.link-shared=true
         --set rust.lto=thin
         --set rust.codegen-units=1
       # Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
@@ -537,6 +538,36 @@ auto:
       CODEGEN_BACKENDS: llvm,cranelift
     <<: *job-macos
 
+  - name: aarch64-apple-distcheck
+    env:
+      SCRIPT: >-
+        ./x.py test distcheck
+        --host=aarch64-apple-darwin
+        --target=aarch64-apple-darwin
+      DISTCHECK_CONFIGURE_ARGS: >-
+        --set llvm.link-shared=true
+      # Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
+      # supports the hardware.
+      MACOSX_DEPLOYMENT_TARGET: 11.0
+      MACOSX_STD_DEPLOYMENT_TARGET: 11.0
+      DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
+    <<: *job-macos
+
+  - name: aarch64-apple-distcheck-ci-llvm
+    env:
+      SCRIPT: >-
+        ./x.py test distcheck
+        --host=aarch64-apple-darwin
+        --target=aarch64-apple-darwin
+      RUST_CONFIGURE_ARGS: >-
+        --set llvm.link-shared=true
+      # Aarch64 tooling only needs to support macOS 11.0 and up as nothing else
+      # supports the hardware.
+      MACOSX_DEPLOYMENT_TARGET: 11.0
+      MACOSX_STD_DEPLOYMENT_TARGET: 11.0
+      DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
+    <<: *job-macos
+
   - name: aarch64-apple
     env:
       SCRIPT: >

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ pub fn is_valid_test_suite_arg<'a, P: AsRef<Path>>(`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`
	`288`	`+#[allow(dead_code)]`
`288`	`289`	`pub fn make(host: &str) -> PathBuf {`
`289`	`290`	`if host.contains("dragonfly")`
`290`	`291`	`\|\| host.contains("freebsd")`