From bdf409ea5cbfc063179bf9fc7dc9ef2344e1faf5 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 17 Jul 2012 13:38:15 +0000
Subject: [PATCH] Option -mstrict-X only available starting of avr-gcc 4.7.0

---
 src/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 3a453dec4..417172585 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -231,7 +231,7 @@ EXTRAINCDIRS = . translations
 # NOTE: PCB version now overrides all the earlier individual settings
 #       These individual settings work only for PCB=STD
 
-CPPDEFS += -DTRANSLATIONS_$(TRANSLATIONS) -DTTS_$(TTS)
+CPPDEFS += -DTRANSLATIONS_$(TRANSLATIONS)
 
 ifeq ($(UNITS), IMPERIAL)
   CPPDEFS += -DIMPERIAL_UNITS
@@ -469,7 +469,13 @@ ifneq ($(PCB), ARM)
   ifeq ($(GCCVERSIONGTE462),1)
     CPPFLAGS += -flto
   endif
+
   CPPFLAGS += -fno-inline-small-functions
+
+  GCCVERSIONGTE470 := $(shell expr 4.7.0 \<= `$(CC) -dumpversion`)
+  ifeq ($(GCCVERSIONGTE470),1)
+    CPPFLAGS += -mstrict-X
+  endif
 endif
 
 MATH_LIB = -lm
@@ -516,7 +522,7 @@ MSG_CLEANING = Cleaning project:
 ifeq ($(PCB), ARM)
   ALL_CPPFLAGS = -c -mcpu=$(MCU) -mthumb -fomit-frame-pointer -fverbose-asm -Wa,-ahlms=open9x.lst -Dat91sam3s4 -DRUN_FROM_FLASH=1 $(CPPFLAGS) $(GENDEPFLAGS)
 else
-  ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS) -fwhole-program -mstrict-X
+  ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS) -fwhole-program
 endif
 
 MAJ_VER = ${shell sh -c "grep \"MAJ_VERS\" open9x.h | cut -d\  -f3 | egrep -o \"[[:digit:]]\""}