From e2d7e178b3ed60d6dae5c92fa1a0e7e902663450 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Wed, 13 Jul 2016 10:56:44 -0400
Subject: [PATCH] [SCons/Matlab] Link statically to libstdc++ on Linux

Matlab 2016a now uses some C++11 features, and symbols included in some of the
Matlab libraries conflict with the versions from system libraries that Cantera
is compiled with and expects to find, resulting in difficult-to-diagnose memory
errors.
---
 src/matlab/SConscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/matlab/SConscript b/src/matlab/SConscript
index 4d934a990..ff33ad7b1 100644
--- a/src/matlab/SConscript
+++ b/src/matlab/SConscript
@@ -50,7 +50,8 @@ elif os.name == 'posix':
         mexSuffix = '.mexglx'
 
     linkflags.extend(['-Wl,--no-undefined',
-                      '-Wl,--version-script,src/matlab/mexFunction.map'])
+                      '-Wl,--version-script,src/matlab/mexFunction.map',
+                      '-static-libstdc++'])
 
 localenv.Prepend(CPPPATH=['#include', '#src', matlab_include])
 localenv.Append(CPPDEFINES=['MATLAB_MEX_FILE'],