about summary refs log tree commit diff
path: root/src/bootstrap/lib.rs
diff options
context:
space:
mode:
authorjyn <github@jyn.dev>2023-04-12 21:17:08 -0500
committerjyn <github@jyn.dev>2023-04-12 21:17:08 -0500
commit7d64c7cd024ac22e71df104577037d2e2fb42c49 (patch)
tree9a5707976e5b302b87f17382850d49624b66f42e /src/bootstrap/lib.rs
parent4087deaccd8bceb458c9610d29744d5f3504c5c0 (diff)
downloadrust-7d64c7cd024ac22e71df104577037d2e2fb42c49.tar.gz
rust-7d64c7cd024ac22e71df104577037d2e2fb42c49.zip
Add `libLLVM.so` to the target libdir when download-rustc is enabled
Previously, we would only add it to the host libdir, which meant it
couldn't be loaded by `ui-fulldeps` tests that used rustc_private.
Diffstat (limited to 'src/bootstrap/lib.rs')
-rw-r--r--src/bootstrap/lib.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index eaa3afa4b7b..6296fdad8a1 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -805,6 +805,11 @@ impl Build {
         self.stage_out(compiler, mode).join(&*target.triple).join(self.cargo_dir())
     }
 
+    /// Directory where the extracted `rustc-dev` component is stored.
+    fn ci_rustc_dir(&self, target: TargetSelection) -> PathBuf {
+        self.out.join(&*target.triple).join("ci-rustc")
+    }
+
     /// Root output directory for LLVM compiled for `target`
     ///
     /// Note that if LLVM is configured externally then the directory returned