diff options
| author | Petr Hosek <phosek@google.com> | 2023-07-07 20:52:22 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@google.com> | 2023-07-07 20:52:54 +0000 |
| commit | bf171aaa7ac1200857ddeedcded854383dca736b (patch) | |
| tree | c68042a245561558b906df790b8e31e88c0c773e /libc | |
| parent | 14ec3f4b06b5412367c7c1f3e4df14c6e3163edd (diff) | |
| download | llvm-bf171aaa7ac1200857ddeedcded854383dca736b.zip llvm-bf171aaa7ac1200857ddeedcded854383dca736b.tar.gz llvm-bf171aaa7ac1200857ddeedcded854383dca736b.tar.bz2 | |
Revert "[libc] Use LIBC_INCLUDE_DIR in CMake rules"
This reverts commit 6e821f0b3a83fa6bc4f821b26611068675070a5a since
it broke the libc-aarch64-ubuntu-fullbuild-dbg bot.
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/cmake/modules/LLVMLibCObjectRules.cmake | 4 | ||||
| -rw-r--r-- | libc/cmake/modules/LLVMLibCTestRules.cmake | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/libc/cmake/modules/LLVMLibCObjectRules.cmake b/libc/cmake/modules/LLVMLibCObjectRules.cmake index 07de67e..27c73af 100644 --- a/libc/cmake/modules/LLVMLibCObjectRules.cmake +++ b/libc/cmake/modules/LLVMLibCObjectRules.cmake @@ -134,7 +134,7 @@ function(_build_gpu_objects fq_target_name internal_target_name) ${ARGN} ) - set(include_dirs ${LIBC_SOURCE_DIR} ${LIBC_INCLUDE_DIR}) + set(include_dirs ${LIBC_BUILD_DIR}/include ${LIBC_SOURCE_DIR} ${LIBC_BUILD_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 @@ function(create_entrypoint_object fq_target_name) ${ADD_ENTRYPOINT_OBJ_COMPILE_OPTIONS} ) set(internal_target_name ${fq_target_name}.__internal__) - set(include_dirs ${LIBC_SOURCE_DIR} ${LIBC_INCLUDE_DIR}) + set(include_dirs ${LIBC_BUILD_DIR}/include ${LIBC_SOURCE_DIR} ${LIBC_BUILD_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 index 3f18047..b2666d4 100644 --- a/libc/cmake/modules/LLVMLibCTestRules.cmake +++ b/libc/cmake/modules/LLVMLibCTestRules.cmake @@ -148,7 +148,8 @@ function(create_libc_unittest fq_target_name) ${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_INCLUDE_DIR} + ${LIBC_BUILD_DIR} + ${LIBC_BUILD_DIR}/include ) target_compile_options( ${fq_build_target_name} @@ -380,7 +381,8 @@ function(add_libc_fuzzer target_name) ${fq_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_INCLUDE_DIR} + ${LIBC_BUILD_DIR} + ${LIBC_BUILD_DIR}/include ) target_link_libraries(${fq_target_name} PRIVATE @@ -510,7 +512,8 @@ function(add_integration_test test_name) ${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_INCLUDE_DIR} + ${LIBC_BUILD_DIR} + ${LIBC_BUILD_DIR}/include ) target_compile_options(${fq_build_target_name} PRIVATE -fpie -ffreestanding -fno-exceptions -fno-rtti ${INTEGRATION_TEST_COMPILE_OPTIONS}) @@ -674,7 +677,8 @@ function(add_libc_hermetic_test test_name) ${fq_build_target_name} PRIVATE ${LIBC_SOURCE_DIR} - ${LIBC_INCLUDE_DIR} + ${LIBC_BUILD_DIR} + ${LIBC_BUILD_DIR}/include ) target_compile_options(${fq_build_target_name} PRIVATE ${LIBC_HERMETIC_TEST_COMPILE_OPTIONS} ${HERMETIC_TEST_COMPILE_OPTIONS}) |