Skip to content
Snippets Groups Projects
Commit 2aa2eaf9 authored by James R.'s avatar James R.
Browse files

Merge remote-tracking branch 'origin/master' into next

parents 1bdcb8d9 ec8fddf7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 5 deletions
src/Makefile.cfg
+ 42
− 5
View file @ 2aa2eaf9
...@@ -12,14 +12,15 @@ ...@@ -12,14 +12,15 @@
# to avoid a false positive with the version detection... # to avoid a false positive with the version detection...
SUPPORTED_GCC_VERSIONS:=\ SUPPORTED_GCC_VERSIONS:=\
91\ 101 102\
81 82 83\ 91 92 93\
71 72\ 81 82 83 84\
71 72 73 74 75\
61 62 63 64\ 61 62 63 64\
51 52 53 54\ 51 52 53 54 55\
40 41 42 43 44 45 46 47 48 49 40 41 42 43 44 45 46 47 48 49
LATEST_GCC_VERSION=9.1 LATEST_GCC_VERSION=10.2
# gcc or g++ # gcc or g++
ifdef PREFIX ifdef PREFIX
...@@ -68,7 +69,27 @@ ifeq (,$(filter GCC%,$(.VARIABLES))) ...@@ -68,7 +69,27 @@ ifeq (,$(filter GCC%,$(.VARIABLES)))
endif endif
endif endif
ifdef GCC102
GCC101=1
endif
ifdef GCC101
GCC93=1
endif
ifdef GCC93
GCC92=1
endif
ifdef GCC92
GCC91=1
endif
ifdef GCC91 ifdef GCC91
GCC84=1
endif
ifdef GCC84
GCC83=1 GCC83=1
endif endif
...@@ -81,6 +102,18 @@ GCC81=1 ...@@ -81,6 +102,18 @@ GCC81=1
endif endif
ifdef GCC81 ifdef GCC81
GCC75=1
endif
ifdef GCC75
GCC74=1
endif
ifdef GCC74
GCC73=1
endif
ifdef GCC73
GCC72=1 GCC72=1
endif endif
...@@ -105,6 +138,10 @@ GCC61=1 ...@@ -105,6 +138,10 @@ GCC61=1
endif endif
ifdef GCC61 ifdef GCC61
GCC55=1
endif
ifdef GCC55
GCC54=1 GCC54=1
endif endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment