Skip to content

Commit

Permalink
Remove ninja
Browse files Browse the repository at this point in the history
  • Loading branch information
justsmth committed Jul 15, 2024
1 parent 77346d8 commit 433dbc2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/cross.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,6 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Install ninja-build tool
if: ${{ matrix.target == 'aarch64-pc-windows-msvc' }}
uses: seanmiddleditch/gha-setup-ninja@v4
- uses: dtolnay/rust-toolchain@master
id: toolchain
with:
Expand Down
9 changes: 0 additions & 9 deletions aws-lc-sys/builder/cmake_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ fn test_clang_cl_command() -> bool {
execute_command("clang-cl".as_ref(), &["--version".as_ref()]).status
}

fn test_ninja_command() -> bool {
execute_command("ninja".as_ref(), &["--version".as_ref()]).status
|| execute_command("ninja-build".as_ref(), &["--version".as_ref()]).status
}

fn test_nasm_command() -> bool {
execute_command("nasm".as_ref(), &["-version".as_ref()]).status
}
Expand Down Expand Up @@ -264,10 +259,6 @@ impl crate::Builder for CmakeBuilder {
missing_dependency = true;
}
if target_arch() == "aarch64" && target_env() == "msvc" {
if !test_ninja_command() {
eprintln!("Missing dependency: ninja");
missing_dependency = true;
}
if !test_clang_cl_command() {
eprintln!("Missing dependency: clang-cl");
missing_dependency = true;
Expand Down

0 comments on commit 433dbc2

Please sign in to comment.