From c5689886400bea41a002de8983fcc971fc2d2e93 Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Sat, 28 Sep 2013 20:26:16 +0200
Subject: [PATCH] Add support for gcc 4.6 and ccache.

---
 SConstruct | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index 6d7d43a60b..33701dc72f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -36,9 +36,6 @@ env = Environment(
     tools = ['default', 'protoc']
 )
 
-GCC_VERSION = re.split('\.', commands.getoutput(env['CXX'] + ' -dumpversion'))
-
-
 # Use a newer gcc on FreeBSD
 if FreeBSD:
     env.Replace(CC = 'gcc46')
@@ -53,6 +50,17 @@ if OSX:
     env.Append(LINKFLAGS='-stdlib=libc++')
     env['FRAMEWORKS'] = ['AppKit']
 
+GCC_VERSION = re.split('\.', commands.getoutput(env['CXX'] + ' -dumpversion'))
+
+# Add support for ccache. Usage: scons ccache=1
+ccache = ARGUMENTS.get('ccache', 0)
+if int(ccache):
+    env.Prepend(CC = ['ccache'])
+    env.Prepend(CXX = ['ccache'])
+    ccache_dir = os.getenv('CCACHE_DIR')
+    if ccache_dir:
+        env.Replace(CCACHE_DIR = ccache_dir)
+
 #
 # Builder for CTags
 #
@@ -239,7 +247,9 @@ env.Append(CXXFLAGS = ['-O1', '-pthread', '-Wno-invalid-offsetof', '-Wformat']+D
 #
 env.Append(CXXFLAGS = ['-frtti'])
 
-if (int(GCC_VERSION[0]) > 4 or (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) >= 7)):
+if (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) == 6):
+    env.Append(CXXFLAGS = ['-std=c++0x'])
+elif (int(GCC_VERSION[0]) > 4 or (int(GCC_VERSION[0]) == 4 and int(GCC_VERSION[1]) >= 7)):
     env.Append(CXXFLAGS = ['-std=c++11'])
 
 # FreeBSD doesn't support O_DSYNC