Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
450b864
Clean up 'HashMap' and 'HashSet' docs;
bjoernager Feb 7, 2025
3948be6
clippy: directly use rustc_abi instead of reexports
workingjubilee Feb 5, 2025
1f37b9a
compiler: remove rustc_target::abi entirely
workingjubilee Feb 5, 2025
eddfe8f
compiler: remove reexports from rustc_target::callconv
workingjubilee Feb 5, 2025
a3a9c28
Update minifier version to `0.3.4`
GuillaumeGomez Feb 7, 2025
ba12489
Add comment for regression #136223 on borrowck-errors.rs
Shunpoco Feb 1, 2025
7155382
Make `AsyncFnOnce`, `AsyncFnMut`, `AsyncFn` non-`#[fundamental]`
steffahn Feb 8, 2025
597143b
Have a break from review rotation
chenyukang Feb 8, 2025
c097b2c
transmutability: fix ICE when passing wrong ADT to ASSUME
Feb 8, 2025
221416d
compiler: use rustc_abi in rustc_ast_*
workingjubilee Nov 3, 2024
4b8b18f
resolve `llvm-config` path properly on cross builds
onur-ozkan Feb 7, 2025
949c9c4
add coverage for llvm-config path resolution
onur-ozkan Feb 8, 2025
32955b9
Small resolve refactor
llogiq Feb 8, 2025
4457f44
Document `Sum::sum` returns additive identities for `[]`
JakenHerman Feb 7, 2025
e690d5d
Rollup merge of #136397 - Shunpoco:issue-136223-ICE-pattern-mutabilit…
workingjubilee Feb 9, 2025
35f6be8
Rollup merge of #136681 - onur-ozkan:132926, r=jieyouxu
workingjubilee Feb 9, 2025
808f739
Rollup merge of #136686 - bjoernager:master, r=jhpratt
workingjubilee Feb 9, 2025
662f24f
Rollup merge of #136694 - GuillaumeGomez:update-minifier, r=notriddle
workingjubilee Feb 9, 2025
7b81236
Rollup merge of #136706 - workingjubilee:finish-up-rustc-abi-updates,…
workingjubilee Feb 9, 2025
eb0e0b5
Rollup merge of #136710 - JakenHerman:jaken/iterator-docs, r=workingj…
workingjubilee Feb 9, 2025
c5801fd
Rollup merge of #136724 - steffahn:asyncfn-non-fundamental, r=compile…
workingjubilee Feb 9, 2025
1873500
Rollup merge of #136727 - chenyukang:yukang-fix-review-scope, r=worki…
workingjubilee Feb 9, 2025
05adcca
Rollup merge of #136730 - lukas-code:trans-ice, r=jswrenn
workingjubilee Feb 9, 2025
79186b7
Rollup merge of #136736 - llogiq:small-resolve-refactor, r=jieyouxu
workingjubilee Feb 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resolve llvm-config path properly on cross builds
Signed-off-by: onur-ozkan <[email protected]>
  • Loading branch information
onur-ozkan committed Feb 8, 2025
commit 4b8b18fd446aefead03998e88d6df0ec61f37977
11 changes: 8 additions & 3 deletions src/bootstrap/src/core/build_steps/llvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,14 @@ pub fn prebuilt_llvm_config(
let root = "src/llvm-project/llvm";
let out_dir = builder.llvm_out(target);

let mut llvm_config_ret_dir = builder.llvm_out(builder.config.build);
llvm_config_ret_dir.push("bin");
let build_llvm_config = llvm_config_ret_dir.join(exe("llvm-config", builder.config.build));
let build_llvm_config = if target == builder.config.build {
let mut llvm_config_ret_dir = builder.llvm_out(builder.config.build);
llvm_config_ret_dir.push("bin");
llvm_config_ret_dir.join(exe("llvm-config", builder.config.build))
} else {
builder.ensure(Llvm { target: builder.config.build }).llvm_config
};

let llvm_cmake_dir = out_dir.join("lib/cmake/llvm");
let res = LlvmResult { llvm_config: build_llvm_config, llvm_cmake_dir };

Expand Down
Loading