From ff0258aa8de187e4a8cab95ac75fa23206df766c Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Sat, 29 Jun 2013 10:01:34 +0200
Subject: [PATCH] Remove FreeBSD hack by requiring a newer gcc from ports.

---
 BeastConfig.h | 7 -------
 SConstruct    | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/BeastConfig.h b/BeastConfig.h
index 1062e588ba..2fd855f78e 100644
--- a/BeastConfig.h
+++ b/BeastConfig.h
@@ -24,13 +24,6 @@
 
 #define BEAST_USE_BOOST 1
 
-// VFALCO TODO Fix this problem with FreeBSD and std::bind.
-//             We need to enforce a minimum library/g++ version.
-//
-#if __FreeBSD__
-#define BEAST_BIND_USES_BOOST 1
-#endif
-
 #ifndef BEAST_USE_LEAKCHECKED
 #define BEAST_USE_LEAKCHECKED BEAST_CHECK_MEMORY_LEAKS
 #endif
diff --git a/SConstruct b/SConstruct
index 93ee8531a5..025aa6f4ae 100644
--- a/SConstruct
+++ b/SConstruct
@@ -35,6 +35,13 @@ GCC_VERSION = re.split('\.', commands.getoutput(env['CXX'] + ' -dumpversion'))
 #env.Replace(CC = 'clang')
 #env.Replace(CXX = 'clang++')
 
+# Use a newer gcc on FreeBSD
+if FreeBSD:
+    env.Replace(CC = 'gcc46')
+    env.Replace(CXX = 'g++46')
+    env.Append(CCFLAGS = ['-Wl,-rpath=/usr/local/lib/gcc46'])
+    env.Append(LINKFLAGS = ['-Wl,-rpath=/usr/local/lib/gcc46'])
+
 #
 # Builder for CTags
 #