From 4720c16bf8ef1d087df824146b803b8b645b474d Mon Sep 17 00:00:00 2001
From: David Rohr <drohr@jwdt.org>
Date: Wed, 4 Sep 2024 13:09:06 +0200
Subject: [PATCH] ROOT Dictionary: Fix error handling in wrapper for dictionary
 generation

---
 cmake/rootcling_wrapper.sh.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cmake/rootcling_wrapper.sh.in b/cmake/rootcling_wrapper.sh.in
index 8d4e3514a6e81..76ce8c8115ca9 100755
--- a/cmake/rootcling_wrapper.sh.in
+++ b/cmake/rootcling_wrapper.sh.in
@@ -92,10 +92,12 @@ LOGFILE=${DICTIONARY_FILE}.log
   ${COMPILE_DEFINITIONS//;/ } \
   ${PCMDEPS:+-m }${PCMDEPS//;/ -m } \
   ${HEADERS//;/ } \
-  > ${LOGFILE} 2>&1 || cat ${LOGFILE} >&2
+  > ${LOGFILE} 2>&1 || ROOTCLINGRETVAL=$?
 
-if [[ $? != "0" ]]; then
-  rm $DICTIONARY_FILE
+if [[ ${ROOTCLINGRETVAL:-0} != "0" ]]; then
+  cat ${LOGFILE} >&2
+  rm -f $DICTIONARY_FILE
+  echo "ROOT CLING Dictionary generation of $DICTIONARY_FILE failed with error code $ROOTCLINGRETVAL"
   exit 1
 fi