From 7349140621935010abac80efb6a56266084fcded Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Thu, 12 Dec 2024 13:44:58 -0800 Subject: [PATCH] libc: use runtimes dir as base for cmake Fixes: #325 --- zorg/buildbot/builders/annotated/libc-linux.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zorg/buildbot/builders/annotated/libc-linux.py b/zorg/buildbot/builders/annotated/libc-linux.py index 68e034da..412affef 100644 --- a/zorg/buildbot/builders/annotated/libc-linux.py +++ b/zorg/buildbot/builders/annotated/libc-linux.py @@ -113,7 +113,11 @@ def main(argv): cmake_args.append('-DCMAKE_LINKER=/usr/bin/ld.lld') cmake_args.append('-DLLVM_LIBC_MPFR_INSTALL_PATH={}/gmp+mpfr/'.format(os.getenv('HOME'))) - run_command(['cmake', os.path.join(source_dir, 'llvm')] + cmake_args) + if bootstrap_build: + cmake_root = 'llvm' + else: + cmake_root = 'runtimes' + run_command(['cmake', os.path.join(source_dir, cmake_root)] + cmake_args) if lint_build: with step('lint libc'):