[clang] [llvm] [llvm-ifs][CMake] Register llvm-ifs as a host tool for bootstrap builds (PR #241130)
Roland McGrath via cfe-commits
cfe-commits at lists.llvm.org
Tue Nov 10 21:12:54 PST 2026
https://github.com/frobtech created https://github.com/llvm/llvm-project/pull/241130
Register `llvm-ifs` via `setup_host_tool` and forward `LLVM_IFS` across
Clang bootstrap stages so CMake build rules can invoke `llvm-ifs` across
standalone, `llvm-driver` multicall, cross-compiled, and multi-stage
configurations.
Assisted-by: Gemini
>From 55b20b4eb30d73f46922ccb765df266ef0600766 Mon Sep 17 00:00:00 2001
From: Roland McGrath <mcgrathr at google.com>
Date: Tue, 10 Nov 2026 20:47:53 -0800
Subject: [PATCH] [llvm-ifs][CMake] Register llvm-ifs as a host tool for
bootstrap builds
Register `llvm-ifs` via `setup_host_tool` and forward `LLVM_IFS` across
Clang bootstrap stages so CMake build rules can invoke `llvm-ifs` across
standalone, `llvm-driver` multicall, cross-compiled, and multi-stage
configurations.
Assisted-by: Gemini
---
clang/CMakeLists.txt | 6 ++++++
llvm/tools/llvm-ifs/CMakeLists.txt | 2 ++
2 files changed, 8 insertions(+)
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index fbb4cfaf090059..7cb8468cc29576 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -858,6 +858,11 @@ if (CLANG_ENABLE_BOOTSTRAP)
set(${CLANG_STAGE}_TABLEGEN
-DLLVM_TABLEGEN=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-tblgen
-DCLANG_TABLEGEN=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang-tblgen)
+ if(TARGET llvm-ifs)
+ add_dependencies(clang-bootstrap-deps llvm-ifs)
+ set(${CLANG_STAGE}_LLVM_IFS
+ -DLLVM_IFS=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ifs${CMAKE_EXECUTABLE_SUFFIX})
+ endif()
if(BOOTSTRAP_CMAKE_SYSTEM_NAME STREQUAL "Linux")
if(BOOTSTRAP_LLVM_ENABLE_LLD)
set(${CLANG_STAGE}_LINKER -DCMAKE_LINKER=${LLVM_RUNTIME_OUTPUT_INTDIR}/ld.lld)
@@ -974,6 +979,7 @@ if (CLANG_ENABLE_BOOTSTRAP)
-DCLANG_STAGE=${NEXT_CLANG_STAGE}
${COMPILER_OPTIONS}
${${CLANG_STAGE}_TABLEGEN}
+ ${${CLANG_STAGE}_LLVM_IFS}
${LTO_LIBRARY} ${verbose} ${PGO_OPT}
${${CLANG_STAGE}_LINKER}
${${CLANG_STAGE}_AR}
diff --git a/llvm/tools/llvm-ifs/CMakeLists.txt b/llvm/tools/llvm-ifs/CMakeLists.txt
index 454aa5b6546102..65cc76d4901a66 100644
--- a/llvm/tools/llvm-ifs/CMakeLists.txt
+++ b/llvm/tools/llvm-ifs/CMakeLists.txt
@@ -21,3 +21,5 @@ DEPENDS
GENERATE_DRIVER
)
+
+setup_host_tool(llvm-ifs LLVM_IFS llvm_ifs_exe llvm_ifs_target)
More information about the cfe-commits
mailing list