summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-05-17 03:16:54 +1000
committer Vas Crabb <vas@vastheman.com>2022-05-17 03:16:54 +1000
commita3ee45c94cb02f1d40b42b70505966a6f51b8357 (patch)
tree3423a3689822a2a03f02827574ffcf02ad7a46a4 /makefile
parent1f8af0c190feb07d595ccf6df05af562a85c4b66 (diff)
scripts: Improve str_to_version again.
Don't treat hypen and dot as the same thing - it will cause issues with pacakge revisions. Cleaned up some Lua code as well. Also show warnings about potentially uninitialised stuff with GCC 12, just don't make them fatal errors.
Diffstat (limited to 'makefile')
-rw-r--r--makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/makefile b/makefile
index f4f3b9bf719..362d1f01db6 100644
--- a/makefile
+++ b/makefile
@@ -995,7 +995,7 @@ endif
ifeq ($(OS),windows)
ifeq (posix,$(SHELLTYPE))
-GCC_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null)
+GCC_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpfullversion 2> /dev/null)
CLANG_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$$/\1/" | head -n 1)
PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python)
GIT_AVAILABLE := $(shell git --version > /dev/null 2>&1 && echo git)