summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-12-09 21:30:46 +0000
committerCarl Hetherington <cth@carlh.net>2017-12-09 21:30:46 +0000
commit476c0e9c7c129909ccbb914feacd977e2f60228b (patch)
tree475097c07b35d4d566e81a2f60e2d0d06be35cd6
parent9300212bd136476d986f4f667b4b78bd619ec7dc (diff)
Remove special-casing C++11 stuff.
-rw-r--r--cscript4
-rw-r--r--wscript7
2 files changed, 0 insertions, 11 deletions
diff --git a/cscript b/cscript
index 53e54e8..5803262 100644
--- 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 f608c1f..4236817 100644
--- 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',