[PATCH] D141460: [bootstrap build] Add libc-hdrgen as a build dep for libc bootstrap build.
Siva Chandra via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Jan 31 22:03:50 PST 2023
sivachandra updated this revision to Diff 493824.
sivachandra added a comment.
Use CMake args to pass options to the libc build.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D141460/new/
https://reviews.llvm.org/D141460
Files:
llvm/runtimes/CMakeLists.txt
Index: llvm/runtimes/CMakeLists.txt
===================================================================
--- llvm/runtimes/CMakeLists.txt
+++ llvm/runtimes/CMakeLists.txt
@@ -185,7 +185,7 @@
endforeach()
function(runtime_default_target)
- cmake_parse_arguments(ARG "" "" "DEPENDS;PREFIXES" ${ARGN})
+ cmake_parse_arguments(ARG "" "" "DEPENDS;CMAKE_ARGS;PREFIXES" ${ARGN})
include(${LLVM_BINARY_DIR}/runtimes/Components.cmake OPTIONAL)
set(SUB_CHECK_TARGETS ${SUB_CHECK_TARGETS} PARENT_SCOPE)
@@ -232,6 +232,7 @@
-DCMAKE_ASM_COMPILER_WORKS=ON
${COMMON_CMAKE_ARGS}
${RUNTIMES_CMAKE_ARGS}
+ ${ARG_CMAKE_ARGS}
PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES
LLVM_USE_LINKER
${ARG_PREFIXES}
@@ -378,15 +379,32 @@
list(APPEND extra_deps llvm-link)
endif()
endif()
+ set(libc_tools)
+ set(libc_cmake_args)
+ if("libc" IN_LIST LLVM_ENABLE_RUNTIMES AND LLVM_LIBC_FULL_BUILD)
+ if(TARGET libc-hdrgen)
+ set(libc_tools libc-hdrgen)
+ set(libc_cmake_args "-DLIBC_HDRGEN_EXE=$<TARGET_FILE:libc-hdrgen>"
+ "-DLLVM_LIBC_FULL_BUILD=ON")
+ list(APPEND extra_deps ${libc_tools})
+ else()
+ # We want to build the libc build tools before we can build the libc
+ # itself. So, the libc project should be included in LLVM_ENABLE_PROJECTS.
+ message(FATAL_ERROR
+ "libc-hdrgen target missing; Add the libc project in -LLVM_ENABLE_PROJECTS")
+ endif()
+ endif()
if(NOT LLVM_RUNTIME_TARGETS)
runtime_default_target(
DEPENDS ${builtins_dep} ${extra_deps}
+ CMAKE_ARGS ${libc_cmake_args}
PREFIXES ${prefixes})
set(test_targets check-runtimes)
else()
if("default" IN_LIST LLVM_RUNTIME_TARGETS)
runtime_default_target(
DEPENDS ${builtins_dep} ${extra_deps}
+ CMAKE_ARGS ${libc_cmake_args}
PREFIXES ${prefixes})
list(REMOVE_ITEM LLVM_RUNTIME_TARGETS "default")
else()
@@ -422,7 +440,9 @@
endif()
endif()
runtime_register_target(${name} ${name}
- DEPENDS ${builtins_dep_name})
+ DEPENDS ${builtins_dep_name} ${libc_tools}
+ CMAKE_ARGS ${libc_cmake_args}
+ PREFIXES ${prefixes})
add_dependencies(runtimes runtimes-${name})
add_dependencies(runtimes-configure runtimes-${name}-configure)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D141460.493824.patch
Type: text/x-patch
Size: 2590 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230201/c5ecb956/attachment.bin>
More information about the llvm-commits
mailing list