2 files changed, 46 insertions, 8 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 10b0daf..1811b28 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -174,11 +174,9 @@ if env["PLATFORM"] == "darwin" and env["target"] == "native" :
 			env["CCFLAGS"] = ["-arch", "x86_64"]
 	if "cxx" not in env :
 		env["CXX"] = "clang++"
-		# Compiling Qt5 in C++0x mode includes headers that we don't have
-		if not env["qt5"] :
-			env["CXXFLAGS"] = ["-std=c++11"]
 	if "link" not in env :
-		env["LINK"] = "clang"
+		# Use clang++ instead of clang, otherwise XCode's clang will cause linking errors due to missing C++ standard lib.
+		env["LINK"] = "clang++"
 		if platform.machine() == "x86_64" :
 			env.Append(LINKFLAGS = ["-arch", "x86_64"])
 
@@ -201,6 +199,8 @@ if "ar" in env :
 if "link" in env :
 	env["SHLINK"] = env["link"]
 	env["LINK"] = env["link"]
+
+# Process user-defined external flags
 for flags_type in ["ccflags", "cxxflags", "linkflags"] :
 	if flags_type in env :
 		if isinstance(env[flags_type], str) :
@@ -212,6 +212,10 @@ for flags_type in ["ccflags", "cxxflags", "linkflags"] :
 # where you need it
 env["OBJCCFLAGS"] = []
 
+# Compile code as C++11
+if env["PLATFORM"] != "win32" :
+	env.Append(CXXFLAGS = ["-std=c++11"])
+
 if env["optimize"] :
 	if env["PLATFORM"] == "win32" :
 		env.Append(CCFLAGS = ["/O2"])
@@ -303,7 +307,7 @@ elif env["PLATFORM"] == "sunos" :
 	#env.Append(CXXFLAGS = ["-z verbose"])
 	pass
 else :
-	if "clang" in env["CXX"] :
+	if os.path.basename(env["CXX"]) in ["clang", "clang++"] :
 		env.Append(CXXFLAGS = [
 			"-Weverything",
 			"-Wno-unknown-warning-option", # To stay compatible between CLang versions
@@ -316,7 +320,6 @@ else :
 			"-Wno-c++98-compat-pedantic", # We do different things that violate this, but they could be fixed
 			"-Wno-global-constructors", # We depend on this for e.g. string constants
 			"-Wno-disabled-macro-expansion", # Caused due to system headers
-			"-Wno-c++11-extensions", # We use C++11; turn this off when we use -std=c++11
 			"-Wno-long-long", # We use long long
 			"-Wno-padded",
 			"-Wno-missing-variable-declarations", # Getting rid of CPPUnit warnings
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 3305fd3..173380e 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -68,6 +68,35 @@ def checkObjCHeader(context, header) :
 	context.Result(ret)
 	return ret
 
+def checkForCpp11Support(context) :
+	context.Message('Checking whether the C++ compiler supports C++11... ')
+	result = context.TryLink(
+		"""
+#include <memory>
+
+int main(int, char **) {
+	// shared_ptr test
+	std::shared_ptr<int> intPtr = std::make_shared<int>();
+
+	// unique_ptr test
+	std::unique_ptr<int> intPtrUnique = std::unique_ptr<int>(new int(1));
+
+	// auto test
+	auto otherIntPtr = intPtr;
+	std::shared_ptr<int> fooIntPtr = otherIntPtr;
+
+	// lambda test
+	auto someFunction = [](int i){ i = i * i; };
+
+	// nullptr test
+	double* fooDouble = nullptr;
+	return 0;
+}
+""", '.cpp')
+	context.Result(result)
+	return result
+
+
 ################################################################################
 # Platform configuration
 ################################################################################
@@ -103,13 +132,19 @@ int main(int argc, char* argv[]) {
 	else :
 		return -1
 
-
-conf = Configure(conf_env)
+conf = Configure(conf_env, custom_tests = {
+	'CheckCpp11Support' : checkForCpp11Support,
+	})
 
 if not conf.CheckCXX() or not conf.CheckCC() :
 	print "Error: You need a working compiler"
 	Exit(1)
 
+if not conf.CheckCpp11Support() :
+	print "Error: You need a compiler with support for the C++11 standard"
+	Exit(1)
+
+
 env["HAVE_ZLIB"] = True
 zlib_flags = {}
 zlib_okay = False