Skip to content

Commit 366f879

Browse files
authored
Unrolled build for #144254
Rollup merge of #144254 - ognevny:opt-dist-artifact-dir, r=Kobzol opt-dist: make `artifact-dir` an absolute path for `opt-dist local` ...like for CI environments. the same logic applied as for `build_dir`. fixes the issue where some intermediate steps fail due to path being relative to an active directory r? Kobzol try-job: dist-x86_64-msvc try-job: dist-x86_64-linux
2 parents 3f9f20f + c193f30 commit 366f879

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/tools/opt-dist/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ enum EnvironmentCmd {
6262
python: String,
6363

6464
/// Directory where artifacts (like PGO profiles or rustc-perf) of this workflow
65-
/// will be stored.
65+
/// will be stored. Relative to `checkout_dir`
6666
#[arg(long, default_value = "opt-artifacts")]
6767
artifact_dir: Utf8PathBuf,
6868

@@ -150,7 +150,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
150150
.python_binary(python)
151151
.checkout_dir(checkout_dir.clone())
152152
.host_llvm_dir(llvm_dir)
153-
.artifact_dir(artifact_dir)
153+
.artifact_dir(checkout_dir.join(artifact_dir))
154154
.build_dir(checkout_dir.join(build_dir))
155155
.prebuilt_rustc_perf(rustc_perf_checkout_dir)
156156
.shared_llvm(llvm_shared)

0 commit comments

Comments
 (0)