From 5d1d4081d9e5b2d8748bd3f7b7403a5dffee69b1 Mon Sep 17 00:00:00 2001
From: Nikita Popov <npopov@redhat.com>
Date: Mon, 4 Mar 2024 11:11:51 +0100
Subject: [PATCH] Replace libLLVM symlink with linker script in rustup
components
It turns out that the libLLVM-N.so -> libLLVM.so.N.1 symlink is
also needed when projects like miri link against librustc_driver.so.
As such, we have to distribute it in real rustup components like
rustc-dev, rather than only for download-ci-llvm.
To avoid actually distributing symlinks (which are not supported
or not fully supported by the rustup infrastructure) replace it
with a linker script that does the same thing instead.
---
src/bootstrap/src/core/build_steps/dist.rs | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 067dede904f12..6c7cc3bf6a736 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -2035,10 +2035,18 @@ fn install_llvm_file(
// If we have a symlink like libLLVM-18.so -> libLLVM.so.18.1, install the target of the
// symlink, which is what will actually get loaded at runtime.
builder.install(&t!(fs::canonicalize(source)), destination, 0o644);
+
+ let full_dest = destination.join(source.file_name().unwrap());
if install_symlink {
- // If requested, also install the symlink. This is used by download-ci-llvm.
- let full_dest = destination.join(source.file_name().unwrap());
+ // For download-ci-llvm, also install the symlink, to match what LLVM does. Using a
+ // symlink is fine here, as this is not a rustup component.
builder.copy(&source, &full_dest);
+ } else {
+ // Otherwise, replace the symlink with an equivalent linker script. This is used when
+ // projects like miri link against librustc_driver.so. We don't use a symlink, as
+ // these are not allowed inside rustup components.
+ let link = t!(fs::read_link(source));
+ t!(std::fs::write(full_dest, format!("INPUT({})\n", link.display())));
}
} else {
builder.install(&source, destination, 0o644);