From 3fec8172736722b80bf516c21443ddc818f4ef89 Mon Sep 17 00:00:00 2001 From: Amy Huang Date: Tue, 5 Aug 2025 16:54:56 -0700 Subject: [PATCH 1/2] Make some edits to the libc windows build config --- zorg/buildbot/builders/annotated/libc-windows.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/zorg/buildbot/builders/annotated/libc-windows.py b/zorg/buildbot/builders/annotated/libc-windows.py index 5d83348c5..6494e192f 100644 --- a/zorg/buildbot/builders/annotated/libc-windows.py +++ b/zorg/buildbot/builders/annotated/libc-windows.py @@ -39,17 +39,13 @@ def main(argv): if args.asan: cmake_args.append('-DLLVM_USE_SANITIZER=Address') - cmake_args.append('-DLLVM_ENABLE_PROJECTS=libc') - cmake_args.append('-DLLVM_TARGETS_TO_BUILD=X86') - cmake_args.append('-DLLVM_FORCE_BUILD_RUNTIME=libc') - cmake_args.append('-DLLVM_NATIVE_ARCH=x86_64') - cmake_args.append('-DLLVM_HOST_TRIPLE=x86_64-window-x86-gnu') - cmake_args.append('-DLLVM_LIBC_MPFR_INSTALL_PATH=C:/src/install') + cmake_args.append('-DLLVM_ENABLE_RUNTIMES=libc') + cmake_args.append('-DLLVM_LIBC_MPFR_INSTALL_PATH=C:/src/mpfr-install') - run_command(['cmake', os.path.join(source_dir, 'llvm')] + cmake_args) + run_command(['cmake', os.path.join(source_dir, 'runtimes')] + cmake_args) with step('build llvmlibc', halt_on_fail=True): - run_command(['ninja', 'llvmlibc']) + run_command(['ninja', 'libc']) with step('check-libc'): run_command(['ninja', 'check-libc']) From 866b35943843d157cbf6543b8429f0638d660fca Mon Sep 17 00:00:00 2001 From: Amy Huang Date: Tue, 5 Aug 2025 17:04:00 -0700 Subject: [PATCH 2/2] Remove MPFR --- zorg/buildbot/builders/annotated/libc-windows.py | 1 - 1 file changed, 1 deletion(-) diff --git a/zorg/buildbot/builders/annotated/libc-windows.py b/zorg/buildbot/builders/annotated/libc-windows.py index 6494e192f..7f7bf4aa5 100644 --- a/zorg/buildbot/builders/annotated/libc-windows.py +++ b/zorg/buildbot/builders/annotated/libc-windows.py @@ -40,7 +40,6 @@ def main(argv): cmake_args.append('-DLLVM_USE_SANITIZER=Address') cmake_args.append('-DLLVM_ENABLE_RUNTIMES=libc') - cmake_args.append('-DLLVM_LIBC_MPFR_INSTALL_PATH=C:/src/mpfr-install') run_command(['cmake', os.path.join(source_dir, 'runtimes')] + cmake_args)