Fix tests on platforms that statically-link boost.

[libcxml.git] / cscript

diff --git a/cscript b/cscript
index 53e54e8b07baa5ed161a5b34b3e7329fa964f2ad..66678e3a77c48b8ff5d7db186b1bf1dc3f5dbf52 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,23 +20,15 @@
 
 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':
         cmd += ' --static'
-        if target.distro == 'centos':
-            # 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')
+        if target.distro == 'centos' or (target.distro == 'ubuntu' and target.version == '16.04'):
+            cmd += ' --static-boost-test'
     elif target.platform == 'windows':
         cmd += ' --target-windows'
+
     target.command(cmd)
     target.command('./waf build install')