mirror of
https://github.com/pezkuwichain/revive.git
synced 2026-06-17 14:41:04 +00:00
llvm-builder: use the ninja generator for building the builtins on windows (#299)
The builtins build should use the Ninja generator (MSVC does not build a valid archive). Tested and verified here: https://github.com/paritytech/revive-alex-workflowtest/releases/tag/untagged-f02d0f574bab8404fead Closes #305 Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
This commit is contained in:
@@ -87,6 +87,11 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
brew install ninja
|
brew install ninja
|
||||||
|
|
||||||
|
- name: Install Dependencies
|
||||||
|
if: ${{ matrix.host == 'windows' }}
|
||||||
|
run: |
|
||||||
|
choco install ninja
|
||||||
|
|
||||||
- name: Install LLVM Builder
|
- name: Install LLVM Builder
|
||||||
run: |
|
run: |
|
||||||
cargo install --path crates/llvm-builder
|
cargo install --path crates/llvm-builder
|
||||||
|
|||||||
@@ -117,13 +117,7 @@ pub fn build(
|
|||||||
log::info!("building compiler-rt for rv64emac");
|
log::info!("building compiler-rt for rv64emac");
|
||||||
|
|
||||||
crate::utils::check_presence("cmake")?;
|
crate::utils::check_presence("cmake")?;
|
||||||
|
crate::utils::check_presence("ninja")?;
|
||||||
let generator = if cfg!(target_os = "windows") {
|
|
||||||
"Visual Studio 17 2022"
|
|
||||||
} else {
|
|
||||||
crate::utils::check_presence("ninja")?;
|
|
||||||
"Ninja"
|
|
||||||
};
|
|
||||||
|
|
||||||
let llvm_module_compiler_rt = crate::LLVMPath::llvm_module_compiler_rt()?;
|
let llvm_module_compiler_rt = crate::LLVMPath::llvm_module_compiler_rt()?;
|
||||||
let llvm_compiler_rt_build = crate::LLVMPath::llvm_build_compiler_rt()?;
|
let llvm_compiler_rt_build = crate::LLVMPath::llvm_build_compiler_rt()?;
|
||||||
@@ -136,7 +130,7 @@ pub fn build(
|
|||||||
"-B",
|
"-B",
|
||||||
llvm_compiler_rt_build.to_string_lossy().as_ref(),
|
llvm_compiler_rt_build.to_string_lossy().as_ref(),
|
||||||
"-G",
|
"-G",
|
||||||
generator,
|
"Ninja",
|
||||||
])
|
])
|
||||||
.args(CMAKE_STATIC_ARGS)
|
.args(CMAKE_STATIC_ARGS)
|
||||||
.args(cmake_dynamic_args(build_type, target_env)?)
|
.args(cmake_dynamic_args(build_type, target_env)?)
|
||||||
|
|||||||
Reference in New Issue
Block a user