[libc][NFC] Change the libc fullbuild target name to "libc".

This commit is contained in:
Siva Chandra Reddy 2022-08-19 07:01:47 +00:00
parent 00fa513c03
commit 857286f757
4 changed files with 12 additions and 5 deletions

View File

@ -146,15 +146,17 @@ set(LIBC_COMPONENT)
set(LIBC_INSTALL_DEPENDS) set(LIBC_INSTALL_DEPENDS)
set(LIBC_INSTALL_TARGET) set(LIBC_INSTALL_TARGET)
if(LLVM_LIBC_FULL_BUILD) if(LLVM_LIBC_FULL_BUILD)
set(LIBC_TARGET c) set(LIBC_TARGET libc)
set(LIBC_COMPONENT libc) set(LIBC_COMPONENT libc)
set(LIBC_INSTALL_DEPENDS "c;libc-headers") set(LIBC_INSTALL_DEPENDS "libc;libc-headers")
set(LIBC_INSTALL_TARGET install-libc) set(LIBC_INSTALL_TARGET install-libc)
set(LIBC_ARCHIVE_NAME c)
else() else()
set(LIBC_TARGET llvmlibc) set(LIBC_TARGET llvmlibc)
set(LIBC_COMPONENT llvmlibc) set(LIBC_COMPONENT llvmlibc)
set(LIBC_INSTALL_DEPENDS llvmlibc) set(LIBC_INSTALL_DEPENDS llvmlibc)
set(LIBC_INSTALL_TARGET install-llvmlibc) set(LIBC_INSTALL_TARGET install-llvmlibc)
set(LIBC_ARCHIVE_NAME llvmlibc)
endif() endif()
add_subdirectory(include) add_subdirectory(include)

View File

@ -221,7 +221,7 @@ add_gen_header(
../config/${LIBC_TARGET_OS}/syscall_numbers.h.inc ../config/${LIBC_TARGET_OS}/syscall_numbers.h.inc
) )
if(NOT LLVM_LIBC_FULLBUILD) if(NOT LLVM_LIBC_FULL_BUILD)
# We don't install headers in non-fullbuild mode. # We don't install headers in non-fullbuild mode.
return() return()
endif() endif()

View File

@ -3,6 +3,11 @@ add_entrypoint_library(
DEPENDS DEPENDS
${TARGET_LLVMLIBC_ENTRYPOINTS} ${TARGET_LLVMLIBC_ENTRYPOINTS}
) )
set_target_properties(
${LIBC_TARGET}
PROPERTIES
ARCHIVE_OUTPUT_NAME ${LIBC_ARCHIVE_NAME}
)
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE})

View File

@ -81,7 +81,7 @@ add_custom_command(
DEPENDS ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/api.td ${spec_files} DEPENDS ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/api.td ${spec_files}
libc-prototype-testgen ${TARGET_PUBLIC_HEADERS} libc-prototype-testgen ${TARGET_PUBLIC_HEADERS}
c ${LIBC_TARGET}
) )
add_executable( add_executable(
@ -96,7 +96,7 @@ set_target_properties(
PROPERTIES PROPERTIES
INCLUDE_DIRECTORIES "" INCLUDE_DIRECTORIES ""
) )
target_link_libraries(libc-api-test c) target_link_libraries(libc-api-test ${LIBC_TARGET})
# Only include we need is the include for cpp::IsSame and our generated # Only include we need is the include for cpp::IsSame and our generated
# public headers. # public headers.