Skip to content

Commit 2e6cac6

Browse files
committed
Fix Pico tests compilations with JIT enabled
Signed-off-by: Paul Guyot <[email protected]>
1 parent 195323d commit 2e6cac6

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/platforms/rp2/tests/test_erl_sources/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
include(ExternalProject)
2222
if(NOT AVM_DISABLE_JIT)
2323
set(host_atomvm_jit_target "--target=jit")
24+
set(atomvlib_name "atomvmlib-${AVM_JIT_TARGET_ARCH}.avm")
2425
else()
2526
set(host_atomvm_jit_target "")
27+
set(atomvlib_name "atomvmlib.avm")
2628
endif()
2729
ExternalProject_Add(HostAtomVM
2830
SOURCE_DIR ../../../../../../
2931
INSTALL_COMMAND cmake -E echo "Skipping install step."
32+
CMAKE_ARGS -DAVM_DISABLE_JIT=${AVM_DISABLE_JIT}
3033
BUILD_COMMAND cmake --build . --target=atomvmlib ${host_atomvm_jit_target} --target=PackBEAM --target=UF2Tool
3134
)
3235

@@ -67,15 +70,13 @@ set(erlang_test_beams
6770
)
6871

6972
if(NOT AVM_DISABLE_JIT)
70-
set(erlang_test_beams_${AVM_JIT_TARGET_ARCH} ${erlang_test_beams})
71-
list(TRANSFORM erlang_test_beams_${AVM_JIT_TARGET_ARCH} PREPEND ${AVM_JIT_TARGET_ARCH}/)
72-
list(APPEND erlang_test_beams ${erlang_test_beams_${AVM_JIT_TARGET_ARCH}})
73+
list(TRANSFORM erlang_test_beams PREPEND ${AVM_JIT_TARGET_ARCH}/)
7374
endif()
7475

7576
add_custom_command(
7677
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/rp2_test_modules.avm"
7778
COMMAND HostAtomVM-prefix/src/HostAtomVM-build/tools/packbeam/PackBEAM -i rp2_test_modules.avm
78-
HostAtomVM-prefix/src/HostAtomVM-build/libs/atomvmlib.avm
79+
HostAtomVM-prefix/src/HostAtomVM-build/libs/${atomvlib_name}
7980
${erlang_test_beams}
8081
DEPENDS
8182
HostAtomVM

0 commit comments

Comments
 (0)