blob: 0a4ead2b9ba08ad771549165368336324d7b9ce9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
diff -Naur a/src/Makefile b/src/Makefile
--- a/src/Makefile 2017-10-24 01:20:32.657585146 +0200
+++ b/src/Makefile 2018-09-04 01:24:08.136642573 +0200
@@ -167,8 +167,8 @@
CFLAGS += -msse2
CXXFLAGS += -msse2
- GCC_GTEQ_440 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40400)
- GCC_GTEQ_430 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40300)
+ GCC_GTEQ_440 := $(shell expr `gcc -dumpfullversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40400)
+ GCC_GTEQ_430 := $(shell expr `gcc -dumpfullversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40300)
ifeq "$(GCC_GTEQ_440)" "1"
CFLAGS += -maes
CXXFLAGS += -maes
@@ -202,7 +202,7 @@
ifneq "$(origin WXSTATIC)" "command line"
LFLAGS += -ldl
else
- GCC5USED := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 5)
+ GCC5USED := $(shell expr `gcc -dumpfullversion | cut -f1 -d.` \>= 5)
ifeq "$(GCC5USED)" "1"
CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
WXCONFIG_CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
|
