Skip to content

Commit 1aac532

Browse files
committed
Fix: broken builds - back out prune
Backs out the prune option from atomvm#2133 We need to be careful about exactly what and why we prune. Build artifacts were incomplete. Signed-off-by: Peter M <petermm@gmail.com>
1 parent 311a8ef commit 1aac532

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

CMakeModules/BuildElixir.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ macro(pack_runnable avm_name main)
9494
add_custom_command(
9595
OUTPUT ${avm_name}.avm
9696
DEPENDS ${avm_name}_main ${ARCHIVE_TARGETS} PackBEAM Elixir.${main}.beam ${ARCHIVES}
97-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create -p -s Elixir.${main} ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES}
97+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create -s Elixir.${main} ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES}
9898
COMMENT "Packing runnable ${avm_name}.avm"
9999
VERBATIM
100100
)

CMakeModules/BuildErlang.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ macro(pack_runnable avm_name main)
289289
add_custom_command(
290290
OUTPUT ${avm_name}.avm
291291
DEPENDS ${avm_name}_main ${main}.beam ${pack_runnable_${avm_name}_archives} ${pack_runnable_${avm_name}_archive_targets} PackBEAM
292-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create -p -s ${main} ${INCLUDE_LINES} ${avm_name}.avm ${main}.beam ${pack_runnable_${avm_name}_archives}
292+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create -s ${main} ${INCLUDE_LINES} ${avm_name}.avm ${main}.beam ${pack_runnable_${avm_name}_archives}
293293
COMMENT "Packing runnable ${avm_name}.avm"
294294
VERBATIM
295295
)
@@ -421,7 +421,7 @@ macro(pack_uf2 avm_name main)
421421
add_custom_command(
422422
OUTPUT ${avm_name}.avm
423423
DEPENDS ${avm_name}_main ${main}.beam ${pack_uf2_${avm_name}_archives} ${pack_uf2_${avm_name}_archive_targets} PackBEAM
424-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create ${INCLUDE_LINES} -p -s ${main} ${avm_name}.avm ${main}.beam ${pack_uf2_${avm_name}_archives}
424+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create ${INCLUDE_LINES} -s ${main} ${avm_name}.avm ${main}.beam ${pack_uf2_${avm_name}_archives}
425425
COMMENT "Packing runnable ${avm_name}.avm"
426426
VERBATIM
427427
)

CMakeModules/BuildGleam.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ macro(pack_gleam_runnable avm_name main)
7575
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/gleam.toml ${CMAKE_CURRENT_SOURCE_DIR}/manifest.toml ${CMAKE_CURRENT_BINARY_DIR}/
7676
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src
7777
COMMAND gleam export erlang-shipment
78-
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create -p -s ${main} ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS} ${ARCHIVES}
78+
COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/packbeam create -s ${main} ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS} ${ARCHIVES}
7979
COMMENT "Packing gleam runnable ${avm_name}.avm"
8080
)
8181

0 commit comments

Comments
 (0)