From d502402c1ae51abcbbdb88a59057c33d77fe331b Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Wed, 26 Oct 2022 22:51:40 +0200
Subject: [PATCH] armbian-next: show more complete gcc versions in logs

---
 lib/functions/compilation/atf.sh    | 2 +-
 lib/functions/compilation/kernel.sh | 2 +-
 lib/functions/compilation/uboot.sh  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/functions/compilation/atf.sh b/lib/functions/compilation/atf.sh
index 16405c629a..03a645d821 100644
--- a/lib/functions/compilation/atf.sh
+++ b/lib/functions/compilation/atf.sh
@@ -41,7 +41,7 @@ compile_atf() {
 		# build aarch64
 	fi
 
-	display_alert "Compiler version" "${ATF_COMPILER}gcc $(eval env PATH="${toolchain}:${PATH}" "${ATF_COMPILER}gcc" -dumpversion)" "info"
+	display_alert "Compiler version" "${ATF_COMPILER}gcc $(eval env PATH="${toolchain}:${PATH}" "${ATF_COMPILER}gcc" -dumpfullversion -dumpversion)" "info"
 
 	local target_make target_patchdir target_files
 	target_make=$(cut -d';' -f1 <<< "${ATF_TARGET_MAP}")
diff --git a/lib/functions/compilation/kernel.sh b/lib/functions/compilation/kernel.sh
index 10754418b5..d3ca750342 100644
--- a/lib/functions/compilation/kernel.sh
+++ b/lib/functions/compilation/kernel.sh
@@ -286,7 +286,7 @@ function kernel_config() {
 		[[ -z $toolchain ]] && exit_with_error "Could not find required toolchain" "${KERNEL_COMPILER}gcc $KERNEL_USE_GCC"
 	fi
 
-	kernel_compiler_version="$(eval env PATH="${toolchain}:${PATH}" "${KERNEL_COMPILER}gcc" -dumpversion)"
+	kernel_compiler_version="$(eval env PATH="${toolchain}:${PATH}" "${KERNEL_COMPILER}gcc" -dumpfullversion -dumpversion)"
 	display_alert "Compiler version" "${KERNEL_COMPILER}gcc ${kernel_compiler_version}" "info"
 
 	# copy kernel config
diff --git a/lib/functions/compilation/uboot.sh b/lib/functions/compilation/uboot.sh
index 0db507d837..2152a1b8ab 100644
--- a/lib/functions/compilation/uboot.sh
+++ b/lib/functions/compilation/uboot.sh
@@ -250,8 +250,8 @@ compile_uboot() {
 		# build aarch64
 	fi
 
-	display_alert "Compiler version" "${UBOOT_COMPILER}gcc $(eval env PATH="${toolchain}:${toolchain2}:${PATH}" "${UBOOT_COMPILER}gcc" -dumpversion)" "info"
-	[[ -n $toolchain2 ]] && display_alert "Additional compiler version" "${toolchain2_type}gcc $(eval env PATH="${toolchain}:${toolchain2}:${PATH}" "${toolchain2_type}gcc" -dumpversion)" "info"
+	display_alert "Compiler version" "${UBOOT_COMPILER}gcc $(eval env PATH="${toolchain}:${toolchain2}:${PATH}" "${UBOOT_COMPILER}gcc" -dumpfullversion -dumpversion)" "info"
+	[[ -n $toolchain2 ]] && display_alert "Additional compiler version" "${toolchain2_type}gcc $(eval env PATH="${toolchain}:${toolchain2}:${PATH}" "${toolchain2_type}gcc" -dumpfullversion -dumpversion)" "info"
 
 	local uboot_name="${CHOSEN_UBOOT}_${REVISION}_${ARCH}"