From d8f1f9b395f3ea8dcd8b33f90ffd47e3469b83c6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 2 Apr 2020 14:26:42 +0200 Subject: Tidy up C++11 flag setup. --- cscript | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 929fe3a..b65723a 100644 --- a/cscript +++ b/cscript @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2016 Carl Hetherington +# Copyright (C) 2016-2020 Carl Hetherington # # This file is part of libcxml. # @@ -20,6 +20,8 @@ import os +option_defaults = { 'force-cpp11', False } + def build(target, options): cmd = './waf configure --prefix=%s' % target.directory if target.platform == 'linux': @@ -28,18 +30,25 @@ 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.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': - # Similarly with Windows - cmd += ' --force-cpp11 --target-windows' + cmd += ' --target-windows' + + # 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. Mageia 6 pulls the same stunt except it's + # libxml++ that requires C++11 + force_cpp11 = False + if target.platform == 'linux': + if target.distro == 'centos' and target.version == '7': + force_cpp11 = True + if target.distro == 'mageia' and target.version == '6': + force_cpp11 = True + if target.platform == 'windows': + force_cpp11 = True + if force_cpp11 or options['force-cpp11']: + cmd += ' --force-cpp11' + target.command(cmd) target.command('./waf build install') -- cgit v1.2.3