[boinc] 06/12: Remove old gcc < 4.8 workaround (flto flag), now backports are not possible because of the wx3.0, so it is useless to have them anymore

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit d8a5de44679fe62dd1cbaba518b62b44a810d340
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Aug 12 20:08:56 2014 +0200

    Remove old gcc < 4.8 workaround (flto flag), now backports are not possible because of the wx3.0, so it is useless to have them anymore
---
 debian/rules | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/debian/rules b/debian/rules
index b9a144d..c3e90fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,20 +100,14 @@ ifeq ($(DEB_HOST_GNU_TYPE), i486-gnu)
   #TYPE_FLAGS += --with-boinc-platform=i686-pc-hurd-gnu
 endif
 
-ifneq (clang++,$(CXX))
+ifneq (,$(findstring clang,$(DEB_BUILD_OPTIONS)))
+  export CXX=clang
+endif
 
-GCCVERSION=$(shell gcc --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.)
-# gcc 4.6 on precise has issues while gcc 4.7 on sid is just fine
-ifneq (4.6,$(GCCVERSION))
-ifneq (4.5,$(GCCVERSION))
-ifneq (4.4,$(GCCVERSION))
+ifneq (clang++,$(CXX))
  CFLAGS += -flto
  LDFLAGS += -flto
 endif
-endif
-endif
-
-endif
 
 CFLAGS += -Wall
 CXXFLAGS += -Wall
@@ -121,11 +115,6 @@ CXXFLAGS += -Wall
 # hurd needs the following
 LDFLAGS += -Wl,--no-add-needed
 
-
-ifneq (,$(findstring clang,$(DEB_BUILD_OPTIONS)))
-  export CXX=clang
-endif
-
 ifeq (,$(DEB_OPT_FLAGS))
    DEB_OPT_FLAGS = -O3 -funroll-loops -fforce-addr -ffast-math
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git