Remove special-casing C++11 stuff.

diff --git a/cscript b/cscript
index 53e54e8b07baa5ed161a5b34b3e7329fa964f2ad..58032626bdf9a20e580f9b8cfcc8ae6cfca06c63 100644 (file)
--- a/cscript
+++ b/cscript
@@ -31,10 +31,6 @@ 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')
     elif target.platform == 'windows':
         cmd += ' --target-windows'
     target.command(cmd)

diff --git a/wscript b/wscript
index f608c1fad509edfbab0748446a360617eb51751e..42368178dd4bd8d515391c618f5590c8a68f14c4 100644 (file)
--- a/wscript
+++ b/wscript
@@ -68,13 +68,6 @@ def configure(conf):
 
         conf.recurse('test')
 
-    # libxml++ 2.39.1 and later must be built with -std=c++11
-    libxmlpp_version = conf.cmd_and_log(['pkg-config', '--modversion', 'libxml++-2.6'], output=Context.STDOUT, quiet=Context.BOTH)
-    s = libxmlpp_version.split('.')
-    v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2])
-    if v >= 0x022701:
-        conf.env.append_value('CXXFLAGS', '-std=c++11')
-
 def build(bld):
 
     bld(source='libcxml.pc.in',