diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-27 00:23:49 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-03-27 00:23:49 +0000 |
| commit | 1ca2f66168c24db875b9766601970427063c7726 (patch) | |
| tree | 3cab92a6bf963cbe294717c33e09ce2901e36e51 /cscript | |
| parent | 29ebfe58748a931653b63054444cf035d30b8b22 (diff) | |
Only build tests on Ubuntu 18.04 as we need BOOST_TEST.
Diffstat (limited to 'cscript')
| -rw-r--r-- | cscript | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -46,14 +46,15 @@ def build(target, options): cmd += ' --jpeg=%s' % options['jpeg'] if target.platform == 'linux': cmd += ' --static' - if target.distro == 'centos': + if not (target.distro == 'ubuntu' and target.version == '18.04'): + # We only build tests on Ubuntu 18.04 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 == 'centos' and 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' |
