diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt index 38fe16a3c26c7..5c6df6e5a0d37 100644 --- a/libc/CMakeLists.txt +++ b/libc/CMakeLists.txt @@ -168,8 +168,6 @@ set(LIBC_COMPONENT) set(LIBC_INSTALL_DEPENDS) set(LIBC_INSTALL_TARGET) if(LLVM_LIBC_FULL_BUILD) - set(LIBC_TARGET libc) - set(LIBC_COMPONENT libc) set(LIBC_INSTALL_DEPENDS "install-libc-static-archives;install-libc-headers") if(NOT LIBC_TARGET_OS_IS_BAREMETAL) # For now we will disable libc-startup installation for baremetal. The @@ -177,17 +175,13 @@ if(LLVM_LIBC_FULL_BUILD) # and install it as part of the libc installation. list(APPEND LIBC_INSTALL_DEPENDS "libc-startup") endif() - set(LIBC_INSTALL_TARGET install-libc) if(LIBC_TARGET_ARCHITECTURE_IS_GPU) set(LIBC_ARCHIVE_NAME cgpu) else() set(LIBC_ARCHIVE_NAME c) endif() else() - set(LIBC_TARGET llvmlibc) - set(LIBC_COMPONENT llvmlibc) set(LIBC_INSTALL_DEPENDS install-libc-static-archives) - set(LIBC_INSTALL_TARGET install-llvmlibc) set(LIBC_ARCHIVE_NAME llvmlibc) endif() @@ -230,7 +224,7 @@ if(LLVM_LIBC_FULL_BUILD) endif() add_llvm_install_targets( - ${LIBC_INSTALL_TARGET} + install-libc DEPENDS ${LIBC_INSTALL_DEPENDS} - COMPONENT ${LIBC_COMPONENT} + COMPONENT libc ) diff --git a/libc/lib/CMakeLists.txt b/libc/lib/CMakeLists.txt index c91097d5bc7a7..b76fe41a22d36 100644 --- a/libc/lib/CMakeLists.txt +++ b/libc/lib/CMakeLists.txt @@ -1,10 +1,10 @@ add_entrypoint_library( - ${LIBC_TARGET} + libc DEPENDS ${TARGET_LLVMLIBC_ENTRYPOINTS} ) set_target_properties( - ${LIBC_TARGET} + libc PROPERTIES ARCHIVE_OUTPUT_NAME ${LIBC_ARCHIVE_NAME} ) @@ -19,13 +19,13 @@ else() endif() install( - TARGETS ${LIBC_TARGET} + TARGETS libc ARCHIVE DESTINATION ${LIBC_INSTALL_LIBRARY_DIR} COMPONENT libc-static-archives ) add_llvm_install_targets( install-libc-static-archives - DEPENDS ${LIBC_TARGET} + DEPENDS libc COMPONENT libc-static-archives )