[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/18.0.1025.168_r134367-1-2-g8cb8e89

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 8cb8e89b178dc4d46e0955220aecd67e7bff550f
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat May 19 10:22:05 2012 +0200

    Use gcc 4.6 for the moment
    
    Closes: #671994

diff --git a/debian/rules b/debian/rules
index 0b760eb..da5892a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,6 +148,10 @@ AVOID_GCC_44 ?= 0
 
 # Set this to use gcc 4.5 instead of 4.6
 AVOID_GCC_46 ?= 0
+
+# Set this to use gcc 4.6 instead of 4.7
+AVOID_GCC_47 ?= 1
+
 CC_VERSION   := $(shell gcc -dumpversion | cut -d. -f-2)
  
 ifeq (1/4.4,$(AVOID_GCC_44)/$(CC_VERSION))
@@ -163,6 +167,12 @@ CXX := g++-4.5
 BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX)
 endif
 
+ifeq (1/4.7,$(AVOID_GCC_47)/$(CC_VERSION))
+CC  := gcc-4.6
+CXX := g++-4.6
+BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX)
+endif
+
 ifeq (0/4.6,$(AVOID_GCC_46)/$(CC_VERSION))
 GYP_DEFINES += werror=$(NULL)
 endif

-- 
Git repository for pkg-chromium