Skip to content

Fix several CMake dependencies and remove armv4t cross build #1981

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −179
Open

Fix several CMake dependencies and remove armv4t cross build #1981

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
173 changes: 0 additions & 173 deletions .github/workflows/build-and-test-other.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions CMakeModules/BuildErlang.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ macro(pack_lib avm_name)

add_custom_command(
OUTPUT ${avm_name}.avm
DEPENDS ${pack_lib_${avm_name}_archive_targets} PackBEAM
DEPENDS ${pack_lib_${avm_name}_archive_targets} ${pack_lib_${avm_name}_emu_archives} ${pack_lib_${avm_name}_archives} PackBEAM
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${pack_lib_${avm_name}_emu_archives} ${pack_lib_${avm_name}_archives}
COMMENT "Packing lib ${avm_name}.avm"
VERBATIM
Expand All @@ -172,7 +172,7 @@ macro(pack_lib avm_name)

add_custom_command(
OUTPUT ${avm_name}-${jit_target_arch_variant}.avm
DEPENDS ${pack_lib_${avm_name}_archive_targets} PackBEAM
DEPENDS ${pack_lib_${avm_name}_archive_targets} ${pack_lib_${avm_name}_jit_archives_${jit_target_arch_variant}} PackBEAM
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}-${jit_target_arch_variant}.avm ${pack_lib_${avm_name}_jit_archives_${jit_target_arch_variant}} ${pack_lib_${avm_name}_archives}
COMMENT "Packing lib ${avm_name}-${jit_target_arch_variant}.avm"
VERBATIM
Expand Down
12 changes: 8 additions & 4 deletions tests/erlang_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ macro(jit_precompile module_name)
endmacro()

function(compile_erlang module_name)
# Parse optional DEPENDS argument
set(multiValueArgs DEPENDS)
cmake_parse_arguments(COMPILE_ERLANG "" "" "${multiValueArgs}" ${ARGN})

if(AVM_DISABLE_JIT)
set(erlc_define -DAVM_DISABLE_JIT)
else()
Expand All @@ -51,7 +55,7 @@ function(compile_erlang module_name)
add_custom_command(
OUTPUT ${module_name}.beam
COMMAND erlc ${erlc_define} ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}.erl
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}.erl
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}.erl ${COMPILE_ERLANG_DEPENDS}
COMMENT "Compiling ${module_name}.erl"
)
jit_precompile(${module_name})
Expand Down Expand Up @@ -566,12 +570,12 @@ compile_erlang(small_big_ext)
compile_erlang(test_crypto)

compile_erlang(test_code_all_available_loaded)
compile_erlang(test_code_load_binary)
compile_erlang(test_code_load_binary DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/code_load/export_test_module_data.hrl)
compile_erlang(test_code_load_abs)
compile_erlang(test_code_ensure_loaded)
compile_erlang(test_add_avm_pack_binary)
compile_erlang(test_add_avm_pack_binary DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/code_load/code_load_pack_data.hrl)
compile_erlang(test_add_avm_pack_file)
compile_erlang(test_close_avm_pack)
compile_erlang(test_close_avm_pack DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/code_load/code_load_pack_data.hrl)

compile_erlang(test_module_info)
compile_erlang(erlang_module_loaded)
Expand Down
Loading