This is an archive of the discontinued LLVM Phabricator instance.

Differential D158894

[libc] Add missing ${LIBC_INCLUDE_DIR} to object rule
ClosedPublic

Authored by phosek on Aug 25 2023, 2:23 PM.

Details

Reviewers
michaelrj
sivachandra
Commits
rG15b5ac38cf5d: [libc] Add missing ${LIBC_INCLUDE_DIR} to object rule
Summary

This is breaking the runtimes build with llvm libc enabled.

Diff Detail

Event Timeline

phosek created this revision.Aug 25 2023, 2:23 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptAug 25 2023, 2:23 PM
Herald added a subscriber: libc-commits. · View Herald Transcript
phosek requested review of this revision.Aug 25 2023, 2:23 PM
sivachandra accepted this revision.Aug 25 2023, 2:26 PM
This revision is now accepted and ready to land.Aug 25 2023, 2:26 PM
Harbormaster completed remote builds in B254999: Diff 553625.Aug 25 2023, 4:26 PM
Closed by commit rG15b5ac38cf5d: [libc] Add missing ${LIBC_INCLUDE_DIR} to object rule (authored by phosek). · Explain WhyAug 28 2023, 10:22 PM
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rG15b5ac38cf5d: [libc] Add missing ${LIBC_INCLUDE_DIR} to object rule.

Revision Contents

PathSize
libc/
cmake/
modules/
3 lines

Diff 554182

libc/cmake/modules/LLVMLibCObjectRules.cmake

Show First 20 Lines • Show All 354 Lines • ▼ Show 20 Lines add_library(
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
OBJECT OBJECT
${ADD_OBJECT_SRCS} ${ADD_OBJECT_SRCS}
${ADD_OBJECT_HDRS} ${ADD_OBJECT_HDRS}
) )
target_include_directories( target_include_directories(
${fq_target_name} ${fq_target_name}
PRIVATE PRIVATE
${LIBC_BUILD_DIR}/include
${LIBC_SOURCE_DIR} ${LIBC_SOURCE_DIR}
${LIBC_BUILD_DIR} ${LIBC_INCLUDE_DIR}
) )
target_compile_options(${fq_target_name} PRIVATE ${compile_options}) target_compile_options(${fq_target_name} PRIVATE ${compile_options})
endif() endif()
if(SHOW_INTERMEDIATE_OBJECTS) if(SHOW_INTERMEDIATE_OBJECTS)
message(STATUS "Adding object library ${fq_target_name}") message(STATUS "Adding object library ${fq_target_name}")
if(${SHOW_INTERMEDIATE_OBJECTS} STREQUAL "DEPS") if(${SHOW_INTERMEDIATE_OBJECTS} STREQUAL "DEPS")
foreach(dep IN LISTS ADD_OBJECT_DEPENDS) foreach(dep IN LISTS ADD_OBJECT_DEPENDS)
▲ Show 20 Lines • Show All 533 Lines • Show Last 20 Lines