From 4602bc14a9b229cf2a2e14ad2cd5d3a48bea2747 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 9 Dec 2017 22:44:28 +0000 Subject: Tidy up c++11 stuff. --- cscript | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 94a26d1..612ded1 100644 --- a/cscript +++ b/cscript @@ -9,8 +9,15 @@ def build(target, options): cmd += ' --static' if target.distro == 'centos': cmd += ' --disable-tests' - if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'): - 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' if target.debug: cmd += ' --enable-debug' if target.platform == 'windows': -- cgit v1.2.3