diff --git a/libc/cmake/modules/LLVMLibCObjectRules.cmake b/libc/cmake/modules/LLVMLibCObjectRules.cmake --- a/libc/cmake/modules/LLVMLibCObjectRules.cmake +++ b/libc/cmake/modules/LLVMLibCObjectRules.cmake @@ -134,7 +134,7 @@ ${ARGN} ) - set(include_dirs ${LIBC_BUILD_DIR}/include ${LIBC_SOURCE_DIR} ${LIBC_BUILD_DIR}) + set(include_dirs ${LIBC_SOURCE_DIR} ${LIBC_INCLUDE_DIR}) set(common_compile_options ${ADD_GPU_OBJ_COMPILE_OPTIONS}) if(NOT ADD_GPU_OBJ_CXX_STANDARD) set(ADD_GPU_OBJ_CXX_STANDARD ${CMAKE_CXX_STANDARD}) @@ -585,7 +585,7 @@ ${ADD_ENTRYPOINT_OBJ_COMPILE_OPTIONS} ) set(internal_target_name ${fq_target_name}.__internal__) - set(include_dirs ${LIBC_BUILD_DIR}/include ${LIBC_SOURCE_DIR} ${LIBC_BUILD_DIR}) + set(include_dirs ${LIBC_SOURCE_DIR} ${LIBC_INCLUDE_DIR}) get_fq_deps_list(fq_deps_list ${ADD_ENTRYPOINT_OBJ_DEPENDS}) set(full_deps_list ${fq_deps_list} libc.src.__support.common) diff --git a/libc/cmake/modules/LLVMLibCTestRules.cmake b/libc/cmake/modules/LLVMLibCTestRules.cmake --- a/libc/cmake/modules/LLVMLibCTestRules.cmake +++ b/libc/cmake/modules/LLVMLibCTestRules.cmake @@ -148,8 +148,7 @@ ${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_BUILD_DIR} - ${LIBC_BUILD_DIR}/include + ${LIBC_INCLUDE_DIR} ) target_compile_options( ${fq_build_target_name} @@ -381,8 +380,7 @@ ${fq_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_BUILD_DIR} - ${LIBC_BUILD_DIR}/include + ${LIBC_INCLUDE_DIR} ) target_link_libraries(${fq_target_name} PRIVATE @@ -512,8 +510,7 @@ ${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_BUILD_DIR} - ${LIBC_BUILD_DIR}/include + ${LIBC_INCLUDE_DIR} ) target_compile_options(${fq_build_target_name} PRIVATE -fpie -ffreestanding -fno-exceptions -fno-rtti ${INTEGRATION_TEST_COMPILE_OPTIONS}) @@ -677,8 +674,7 @@ ${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_BUILD_DIR} - ${LIBC_BUILD_DIR}/include + ${LIBC_INCLUDE_DIR} ) target_compile_options(${fq_build_target_name} PRIVATE ${LIBC_HERMETIC_TEST_COMPILE_OPTIONS} ${HERMETIC_TEST_COMPILE_OPTIONS})