From 764f04c31727f1e377a6b8447a017f670ce22e8a Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@gmx.org>
Date: Sun, 17 Feb 2019 15:02:34 +0100
Subject: [PATCH] Use OVERRIDE_CC if defined to determine GCC_VERSION. (nw)

Fixes some cross-compilation issues and most likely edge case using
OVERRIDE_CC.
---
 makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/makefile b/makefile
index 7370284f881..d5dc79988f3 100644
--- a/makefile
+++ b/makefile
@@ -971,7 +971,11 @@ FASTBUILD_PARAMS += $(FASTBUILD_TARGET)-x32
 endif
 endif
 else
+ifdef OVERRIDE_CC
+GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(OVERRIDE_CC)) -dumpversion 2> /dev/null)
+else
 GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null)
+endif
 ifneq ($(OS),solaris)
 CLANG_VERSION    := $(shell $(TOOLCHAIN)$(subst @,,$(CC))  --version  2> /dev/null | head -n 1 | grep -e 'version [0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | grep -e '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | tail -n 1)
 endif