Skip to content

Commit

Permalink
Auto merge of #113323 - Kobzol:pgo-script-llvm-ci, r=jyn514
Browse files Browse the repository at this point in the history
Use `llvm-config` instead of `download-ci-llvm` in PGO script

This should avoid CI breakage when the LLVM stamp is updated, and also it will avoid an unnecessary LLVM download from CI.

r? `@jyn514`
  • Loading branch information
bors committed Jul 6, 2023
2 parents 4b6749b + 12b75fe commit c4c84df
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/ci/stage-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -840,15 +840,20 @@ def extract_dist_dir(name: str) -> Path:
cargo_path = cargo_dir / "bin" / f"cargo{pipeline.executable_extension()}"
assert cargo_path.is_file()

# Specify path to a LLVM config so that LLVM is not rebuilt.
# It doesn't really matter which LLVM config we choose, because no sysroot will be compiled.
llvm_config = pipeline.build_artifacts() / "llvm" / "bin" / f"llvm-config{pipeline.executable_extension()}"
assert llvm_config.is_file()

config_content = f"""profile = "user"
changelog-seen = 2
[build]
rustc = "{rustc_path.as_posix()}"
cargo = "{cargo_path.as_posix()}"
[llvm]
download-ci-llvm = true
[target.{PGO_HOST}]
llvm-config = "{llvm_config.as_posix()}"
"""
logging.info(f"Using following `config.toml` for running tests:\n{config_content}")

Expand Down

0 comments on commit c4c84df

Please sign in to comment.