Use C++17 when the c++17 option is passed in.

[libcxml.git] / cscript

diff --git a/cscript b/cscript
index b9ac538c0c55fc9a1724c3d2127d5595640bb981..310460297a2a240c4ca7ed461224c66aee13692a 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libcxml.
 #
@@ -20,9 +20,6 @@
 
 import os
 
-def dependencies(target):
-    return (('locked_sstream', 'v0.0.5'),)
-
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
     if target.platform == 'linux':
@@ -31,18 +28,12 @@ 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 += f' --target-windows-{target.bits}'
+
+    if 'c++17' in options and options['c++17']:
+        cmd += ' --c++17'
+
     target.command(cmd)
     target.command('./waf build install')