From 900fa704edf3638ea67f5948b4ce81ad55f81724 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 6 Apr 2026 20:56:39 +0200 Subject: [PATCH] bugfix run_asn1c: make make/ninja fail on error Functionality existed to print all output of asn1c on error, but the form asn1c || cat X makes the command exit with a 0 exit code (success). Fix by explicitly returning non-zero exit code in this case: asn1c || ( cat X && false ) Signed-off-by: Robert Schmidt --- cmake_targets/macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake_targets/macros.cmake b/cmake_targets/macros.cmake index 169ef600ce..c19eb285ef 100644 --- a/cmake_targets/macros.cmake +++ b/cmake_targets/macros.cmake @@ -83,7 +83,7 @@ function(run_asn1c ASN1C_GRAMMAR ASN1C_PREFIX) get_filename_component(GRAMMAR_FILE ${ASN1C_GRAMMAR} NAME) set(LOGFILE "${CMAKE_CURRENT_BINARY_DIR}/${GRAMMAR_FILE}.log") add_custom_command(OUTPUT ${ASN1C_OUTPUT} - COMMAND ASN1C_PREFIX=${ASN1C_PREFIX} ${ASN1C_EXEC} ${ASN1C_OPTIONS} -D ${CMAKE_CURRENT_BINARY_DIR} ${ASN1C_GRAMMAR} > ${LOGFILE} 2>&1 || cat ${LOGFILE} + COMMAND ASN1C_PREFIX=${ASN1C_PREFIX} ${ASN1C_EXEC} ${ASN1C_OPTIONS} -D ${CMAKE_CURRENT_BINARY_DIR} ${ASN1C_GRAMMAR} > ${LOGFILE} 2>&1 || ( cat ${LOGFILE} && false ) DEPENDS ${ASN1C_GRAMMAR} COMMENT "Generating ${ASN1C_COMMENT} from ${GRAMMAR_FILE}" )