8000 llvm-builder: use the ninja generator for building the builtins on windows by xermicus · Pull Request #299 · paritytech/revive · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

llvm-builder: use the ninja generator for building the builtins on windows #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2025
Merged

llvm-builder: use the ninja generator for building the builtins on windows #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .github/workflows/release-llvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ jobs:
run: |
brew install ninja

- name: Install Dependencies
if: ${{ matrix.host == 'windows' }}
run: |
choco install ninja

- name: Install LLVM Builder
run: |
cargo install --path crates/llvm-builder
Expand Down
10 changes: 2 additions & 8 deletions crates/llvm-builder/src/builtins.rs
View file
Open in desktop
9E0B
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,7 @@ pub fn build(
log::info!("building compiler-rt for rv64emac");

crate::utils::check_presence("cmake")?;

let generator = if cfg!(target_os = "windows") {
"Visual Studio 17 2022"
} else {
crate::utils::check_presence("ninja")?;
"Ninja"
};
crate::utils::check_presence("ninja")?;

let llvm_module_compiler_rt = crate::LLVMPath::llvm_module_compiler_rt()?;
let llvm_compiler_rt_build = crate::LLVMPath::llvm_build_compiler_rt()?;
Expand All @@ -136,7 +130,7 @@ pub fn build(
"-B",
llvm_compiler_rt_build.to_string_lossy().as_ref(),
"-G",
generator,
"Ninja",
])
.args(CMAKE_STATIC_ARGS)
.args(cmake_dynamic_args(build_type, target_env)?)
Expand Down
Loading
0