summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-02-08 00:13:37 +0100
committerCarl Hetherington <cth@carlh.net>2021-02-08 00:13:37 +0100
commitf6e5596160d68802b7bb75d987cb99e3290df4c3 (patch)
tree6657003d69ebc4e7713cffeeba2edbb506566b36 /cscript
parenteedce87b88d65b89c13e8bea4ad587cace8df44a (diff)
Revert "Build tests on ubuntu 16.04."
This reverts commit 93c2ca7dfc8feeae374c867c1c679334571a7547. Building the tests on 16.04 needs a newer boost than it provides; you can build it statically but then you need to link the boost test library statically (which requires the removal of BOOST_TEST_DYN_LINK all over the place). Doing that fails in libsub for some reason.
Diffstat (limited to 'cscript')
-rw-r--r--cscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/cscript b/cscript
index 41f98b135..7b593c8cb 100644
--- a/cscript
+++ b/cscript
@@ -390,10 +390,10 @@ option_defaults = { "gui": True, "variant": None }
def configure_options(target, options):
opt = ' --warnings-are-errors'
- if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ('16.04', '18.04')) or
+ if not ((target.platform == 'linux' and target.distro == 'ubuntu' and target.version == '18.04') or
(target.platform == 'osx') or
(target.platform == 'windows')):
- # Currently we only build tests on Ubuntu {16,18}.04, macOS and Windows
+ # Currently we only build tests on Ubuntu 18.04, macOS and Windows
opt += ' --disable-tests'
if target.debug: