Skip to content

Commit

Permalink
intel_adsp: Skip adding zephyr_generated_headers dependency
Browse files Browse the repository at this point in the history
I added this kludge to prevent a dependency loop from forming. I have no
idea why this particular library is causing the problem.

Signed-off-by: Keith Packard <[email protected]>
  • Loading branch information
keith-packard committed Aug 24, 2024
1 parent a42e4b3 commit c373712
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -931,8 +931,20 @@ foreach(zephyr_lib ${ZEPHYR_LIBS_PROPERTY})
endif()
endif()

# TODO: Could this become an INTERFACE property of zephyr_interface?
add_dependencies(${zephyr_lib} zephyr_generated_headers)
#
# XXX KLUDGE - intel_adsp_common gets involved in a circular dependency loop if we add this
# dependency, so skip it.
#
# intel_adsp_common ->
# zephyr_generated_headers ->
# offsets_h ->
# offsets ->
# intel_adsp_common
#
if(NOT ${zephyr_lib} STREQUAL intel_adsp_common)
# TODO: Could this become an INTERFACE property of zephyr_interface?
add_dependencies(${zephyr_lib} zephyr_generated_headers)
endif()
endforeach()

# Convenience variable for linkers
Expand Down

0 comments on commit c373712

Please sign in to comment.