Handle C++ flags more neatly.

1 files changed, 11 insertions, 5 deletions

diff --git a/cscript b/cscript
index 53e54e8..b9ac538 100644
--- a/cscript
+++ b/cscript
@@ -31,12 +31,18 @@ def build(target, options):
             # Centos builds using static boost, which means tests don't
             # build as test/tests.cc defines BOOST_TEST_DYN_LINK
             cmd += ' --disable-tests'
-        if ((target.distro == 'debian' and target.version == 'unstable') or
-            (target.distro == 'fedora' and target.version == '23') or
-            (target.distro == 'centos' and target.version == '7')):
-            target.append_with_space('CXXFLAGS', '-std=c++11')
+            if target.version == '7':
+                # Centos 7 ships with glibmm 2.50.0 which requires C++11
+                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
+                # I worry that this will cause ABI problems but I don't have
+                # a better solution.
+                cmd += ' --force-cpp11'
+        if target.distro == 'mageia' and target.version == '6':
+            # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
+            cmd += ' --force-cpp11'
     elif target.platform == 'windows':
-        cmd += ' --target-windows'
+        # Similarly with Windows
+        cmd += ' --force-cpp11 --target-windows'
     target.command(cmd)
     target.command('./waf build install')