Skip to content

Commit f4823c2

Browse files
committed
Use ninja on FreeBSD builds
Signed-off-by: Paul Guyot <pguyot@kallisys.net>
1 parent 45546be commit f4823c2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/build-and-test-on-freebsd.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: "Install deps"
6464
shell: freebsd {0}
6565
run: |
66-
pkg install -y curl cmake gperf erlang elixir rebar3 mbedtls3
66+
pkg install -y curl cmake gperf erlang elixir rebar3 mbedtls3 ninja
6767
6868
- name: "Add hostname to /etc/hosts for distribution tests"
6969
shell: freebsd {0}
@@ -108,19 +108,19 @@ jobs:
108108
cd build
109109
cmake .. -DMBEDTLS_ROOT_DIR=/usr/local -DAVM_WARNINGS_ARE_ERRORS=ON
110110
111-
- name: "Build: run make"
111+
- name: "Build: compile"
112112
shell: freebsd {0}
113113
run: |
114114
cd $GITHUB_WORKSPACE;
115115
cd build
116-
make -j `sysctl -n hw.ncpu`
116+
cmake --build .
117117
118118
- name: "Build: run dialyzer"
119119
shell: freebsd {0}
120120
run: |
121121
cd $GITHUB_WORKSPACE;
122122
cd build
123-
make -j `sysctl -n hw.ncpu`
123+
cmake --build . -t dialyzer
124124
125125
- name: "Test: test-erlang"
126126
shell: freebsd {0}
@@ -197,7 +197,7 @@ jobs:
197197
run: |
198198
cd $GITHUB_WORKSPACE;
199199
cd build
200-
make install
200+
cmake --build . -t install
201201
atomvm examples/erlang/hello_world.avm
202202
atomvm -v
203203
atomvm -h

CMakeModules/BuildElixir.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ macro(pack_archive avm_name)
2929
COMMAND sh -c "mv ${CMAKE_CURRENT_BINARY_DIR}/beams.tmp.${module_name}/Elixir.*.beam ${CMAKE_CURRENT_BINARY_DIR}/beams/"
3030
COMMAND rmdir ${CMAKE_CURRENT_BINARY_DIR}/beams.tmp.${module_name}
3131
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}.ex
32-
COMMENT "Compiling ${module_name}.ex (core)"
32+
COMMENT "Compiling ${module_name}.ex"
3333
VERBATIM
3434
)
3535
set(BEAMS ${BEAMS} ${CMAKE_CURRENT_BINARY_DIR}/beams/Elixir.${module_name}.beam)

0 commit comments

Comments
 (0)