From e10b9cc75624037ac05ece6ce9323b2c926d7555 Mon Sep 17 00:00:00 2001 From: Winford Date: Mon, 3 Feb 2025 22:26:53 +0000 Subject: [PATCH] Fix Erlang and Elixir archive CMakeModules There were typos in both CMakeModules BuildErlang.cmake and BuildElixir.cmake that possibly lead to incorrect output names, especially when stacktrace lines are included. Signed-off-by: Winford --- CMakeModules/BuildElixir.cmake | 4 ++-- CMakeModules/BuildErlang.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeModules/BuildElixir.cmake b/CMakeModules/BuildElixir.cmake index 400650722..7dc8d4c92 100644 --- a/CMakeModules/BuildElixir.cmake +++ b/CMakeModules/BuildElixir.cmake @@ -46,7 +46,7 @@ macro(pack_archive avm_name) add_custom_target( ${avm_name} ALL DEPENDS ${avm_name}_beams PackBEAM - COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${BEAMS} + COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${avm_name}.avm ${BEAMS} COMMENT "Packing archive ${avm_name}.avm" VERBATIM ) @@ -87,7 +87,7 @@ macro(pack_runnable avm_name main) add_custom_target( ${avm_name} ALL - COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES} + COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${avm_name}.avm Elixir.${main}.beam ${ARCHIVES} COMMENT "Packing runnable ${avm_name}.avm" VERBATIM ) diff --git a/CMakeModules/BuildErlang.cmake b/CMakeModules/BuildErlang.cmake index b4c97d380..ec430da21 100644 --- a/CMakeModules/BuildErlang.cmake +++ b/CMakeModules/BuildErlang.cmake @@ -46,7 +46,7 @@ macro(pack_archive avm_name) ${avm_name} ALL DEPENDS ${avm_name}_beams PackBEAM #DEPENDS ${pack_archive_${avm_name}_beams} - COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${pack_archive_${avm_name}_beams} + COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${avm_name}.avm ${pack_archive_${avm_name}_beams} COMMENT "Packing archive ${avm_name}.avm" VERBATIM ) @@ -74,7 +74,7 @@ macro(pack_lib avm_name) add_custom_target( ${avm_name} ALL - COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM -a ${INCLUDE_LINES} ${avm_name}.avm ${pack_lib_${avm_name}_archives} + COMMAND ${CMAKE_BINARY_DIR}/tools/packbeam/PackBEAM ${INCLUDE_LINES} -a ${avm_name}.avm ${pack_lib_${avm_name}_archives} COMMENT "Packing runnable ${avm_name}.avm" VERBATIM )