From 1ed52f5869442dfdacd012540188dac58506e7f3 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Tue, 23 Jan 2024 19:13:25 +0000 Subject: [PATCH] Use a single stage build for Fuchsia toolchain We don't need to test the two stage build and doing only a single stage should significantly reduce the build time. --- zorg/buildbot/builders/annotated/fuchsia-linux.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/zorg/buildbot/builders/annotated/fuchsia-linux.py b/zorg/buildbot/builders/annotated/fuchsia-linux.py index 6681de169..087a4f83c 100644 --- a/zorg/buildbot/builders/annotated/fuchsia-linux.py +++ b/zorg/buildbot/builders/annotated/fuchsia-linux.py @@ -55,21 +55,20 @@ def main(argv): '-S', f'{source_dir}/llvm', '-B', build_dir, '-G', 'Ninja', - '-D', 'BOOTSTRAP_LLVM_ENABLE_LTO=OFF', '-D', 'LLVM_CCACHE_BUILD=ON', '-D', 'LLVM_ENABLE_LTO=OFF', '-D', f'FUCHSIA_SDK={args.sdk_dir}', - '-C', f'{source_dir}/clang/cmake/caches/Fuchsia.cmake', + '-C', f'{source_dir}/clang/cmake/caches/Fuchsia-stage2.cmake', ] run_command(['cmake'] + cmake_args) with step('build'): - run_command(['ninja', '-C', build_dir, 'stage2-toolchain-distribution']) + run_command(['ninja', '-C', build_dir, 'toolchain-distribution']) with step('check'): run_command(['ninja', '-C', build_dir] + - [f'stage2-check-{p}' for p in ('llvm', 'clang', 'lld')]) + [f'check-{p}' for p in ('llvm', 'clang', 'lld')]) return 0