diff --git a/src/tools/opt-dist/src/environment/linux.rs b/src/tools/opt-dist/src/environment/linux.rs index c2a328b1dbc..58b7e6d2306 100644 --- a/src/tools/opt-dist/src/environment/linux.rs +++ b/src/tools/opt-dist/src/environment/linux.rs @@ -14,7 +14,7 @@ fn checkout_path(&self) -> Utf8PathBuf { Utf8PathBuf::from("/checkout") } - fn downloaded_llvm_dir(&self) -> Utf8PathBuf { + fn host_llvm_dir(&self) -> Utf8PathBuf { Utf8PathBuf::from("/rustroot") } diff --git a/src/tools/opt-dist/src/environment/mod.rs b/src/tools/opt-dist/src/environment/mod.rs index d28983d289c..a8650fad011 100644 --- a/src/tools/opt-dist/src/environment/mod.rs +++ b/src/tools/opt-dist/src/environment/mod.rs @@ -15,8 +15,8 @@ fn host_triple(&self) -> String { /// The rustc checkout, where the compiler source is located. fn checkout_path(&self) -> Utf8PathBuf; - /// Path to the downloaded host LLVM. - fn downloaded_llvm_dir(&self) -> Utf8PathBuf; + /// Path to the host LLVM used to compile LLVM in `src/llvm-project`. + fn host_llvm_dir(&self) -> Utf8PathBuf; /// Directory where the optimization artifacts (PGO/BOLT profiles, etc.) /// will be stored. diff --git a/src/tools/opt-dist/src/environment/windows.rs b/src/tools/opt-dist/src/environment/windows.rs index 12a63cbb03c..8a9733d6496 100644 --- a/src/tools/opt-dist/src/environment/windows.rs +++ b/src/tools/opt-dist/src/environment/windows.rs @@ -24,7 +24,7 @@ fn checkout_path(&self) -> Utf8PathBuf { self.checkout_dir.clone() } - fn downloaded_llvm_dir(&self) -> Utf8PathBuf { + fn host_llvm_dir(&self) -> Utf8PathBuf { self.checkout_path().join("citools").join("clang-rust") } diff --git a/src/tools/opt-dist/src/training.rs b/src/tools/opt-dist/src/training.rs index e374af68a7f..59c73fbd695 100644 --- a/src/tools/opt-dist/src/training.rs +++ b/src/tools/opt-dist/src/training.rs @@ -81,7 +81,7 @@ fn merge_llvm_profiles( profdata: LlvmProfdata, ) -> anyhow::Result<()> { let llvm_profdata = match profdata { - LlvmProfdata::Host => env.downloaded_llvm_dir().join("bin/llvm-profdata"), + LlvmProfdata::Host => env.host_llvm_dir().join("bin/llvm-profdata"), LlvmProfdata::Target => env .build_artifacts() .join("llvm")