|
Marcin Dulak |
2bd8633 |
--- src/config/makefile.h.orig
|
|
Marcin Dulak |
2bd8633 |
+++ src/config/makefile.h
|
|
Marcin Dulak |
2bd8633 |
@@ -1003,8 +1003,8 @@ ifeq ($(TARGET),MACX)
|
|
Marcin Dulak |
2bd8633 |
GNUMAJOR=$(shell $(_FC) -dM -E - < /dev/null 2> /dev/null | grep __GNUC__ |cut -c18-)
|
|
Marcin Dulak |
2bd8633 |
ifdef GNUMAJOR
|
|
Marcin Dulak |
2bd8633 |
GNUMINOR=$(shell $(_FC) -dM -E - < /dev/null 2> /dev/null | egrep __GNUC_MINOR | cut -c24)
|
|
Marcin Dulak |
2bd8633 |
- GNU_GE_4_6 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 6 \) ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
- GNU_GE_4_8 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 8 \) ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
+ GNU_GE_4_6 = $(shell [ $(GNUMAJOR) -gt 4 ] || [ $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 6 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
+ GNU_GE_4_8 = $(shell [ $(GNUMAJOR) -gt 4 ] || [ $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 8 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
GNU_GE_6 = $(shell [ $(GNUMAJOR) -ge 6 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
endif
|
|
Marcin Dulak |
2bd8633 |
ifeq ($(GNU_GE_4_6),true)
|
|
Marcin Dulak |
2bd8633 |
@@ -1354,8 +1354,8 @@ ifeq ($(TARGET),$(findstring $(TARGET),LINUX CYGNUS CYGWIN))
|
|
Marcin Dulak |
2bd8633 |
GNUMAJOR=$(shell $(_FC) -dM -E - < /dev/null 2> /dev/null | grep __GNUC__ |cut -c18-)
|
|
Marcin Dulak |
2bd8633 |
ifdef GNUMAJOR
|
|
Marcin Dulak |
2bd8633 |
GNUMINOR=$(shell $(FC) -dM -E - < /dev/null 2> /dev/null | egrep __VERS | cut -c24)
|
|
Marcin Dulak |
2bd8633 |
- GNU_GE_4_6 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 6 \) ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
- GNU_GE_4_8 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 8 \) ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
+ GNU_GE_4_6 = $(shell [ $(GNUMAJOR) -gt 4 ] || [ $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 6 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
+ GNU_GE_4_8 = $(shell [ $(GNUMAJOR) -gt 4 ] || [ $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 8 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
GNU_GE_6 = $(shell [ $(GNUMAJOR) -ge 6 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
GNU_GE_8 = $(shell [ $(GNUMAJOR) -ge 8 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
ifeq ($(GNU_GE_4_6),true)
|
|
Marcin Dulak |
2bd8633 |
@@ -1783,8 +1783,8 @@ endif
|
|
Marcin Dulak |
2bd8633 |
GNUMAJOR=$(shell $(_FC) -dM -E - < /dev/null 2> /dev/null | grep __GNUC__ |cut -c18-)
|
|
Marcin Dulak |
2bd8633 |
ifdef GNUMAJOR
|
|
Marcin Dulak |
2bd8633 |
GNUMINOR=$(shell $(_FC) -dM -E - < /dev/null 2> /dev/null | egrep __GNUC_MINOR | cut -c24)
|
|
Marcin Dulak |
2bd8633 |
- GNU_GE_4_6 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 6 \) ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
- GNU_GE_4_8 = $(shell [ $(GNUMAJOR) -gt 4 -o \( $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 8 \) ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
+ GNU_GE_4_6 = $(shell [ $(GNUMAJOR) -gt 4 ] || [ $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 6 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
+ GNU_GE_4_8 = $(shell [ $(GNUMAJOR) -gt 4 ] || [ $(GNUMAJOR) -eq 4 -a $(GNUMINOR) -ge 8 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
endif
|
|
Marcin Dulak |
2bd8633 |
GNU_GE_6 = $(shell [ $(GNUMAJOR) -ge 6 ] && echo true)
|
|
Marcin Dulak |
2bd8633 |
GNU_GE_8 = $(shell [ $(GNUMAJOR) -ge 8 ] && echo true)
|