Fix tests on platforms that statically-link boost.

[libcxml.git] / cscript

diff --git a/cscript b/cscript
index 929fe3a360465dd31cca3053849caf6338bf61a4..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.
 #
@@ -24,22 +24,11 @@ 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.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.distro == 'centos' or (target.distro == 'ubuntu' and target.version == '16.04'):
+            cmd += ' --static-boost-test'
     elif target.platform == 'windows':
-        # Similarly with Windows
-        cmd += ' --force-cpp11 --target-windows'
+        cmd += ' --target-windows'
+
     target.command(cmd)
     target.command('./waf build install')