From ab649d52f6f5f465630d3e8e8d98f9a9db685ef5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Sep 2024 19:53:43 +0200 Subject: Don't bother building ffcmp on platforms where we don't run tests. It would be nice to check for_package as well but that needs passing into dependencies() to work. --- cscript | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 4862c224e..7205a6dee 100644 --- a/cscript +++ b/cscript @@ -547,21 +547,27 @@ def dependencies(target, options): deps.append(('openssl', '54298369cacfe0ae01c5aa42ace8a463fd2e7a2e')) if can_build_disk(target): deps.append(('lwext4', 'ab082923a791b58478d1d9939d65a0583566ac1f')) - deps.append(('ffcmp', '29265c42838fbb647c404cf73b6fca5259cf2093')) + if build_tests(target): + deps.append(('ffcmp', '29265c42838fbb647c404cf73b6fca5259cf2093')) return deps option_defaults = { "gui": True, "variant": None } -def configure_options(target, options, for_package=False): - opt = ' --warnings-are-errors' - if for_package or not ( +def build_tests(target): + # Currently we only build tests on macOS, Windows, and some Ubuntu versions + return ( (target.platform == 'linux' and target.distro == 'ubuntu' and target.version in ['18.04', '22.04', '24.04']) or (target.platform == 'osx') or (target.platform == 'windows') - ): - # Currently we only build tests on macOS, Windows, and some Ubuntu versions + ) + + +def configure_options(target, options, for_package=False): + opt = ' --warnings-are-errors' + + if for_package or not build_tests(target): opt += ' --disable-tests' if target.debug: -- cgit v1.2.3