Skip to content

Commit

Permalink
Make dependency of zeek on spicy-plugin's driver object file explicit.
Browse files Browse the repository at this point in the history
For generators like Makefile the implicit dependency would not have been
apparent to `make` which could have lead to build failures (depending on
the way targets were scheduled). This patch makes the dependency
explicit so it can be enforced.

Closes #2586.
  • Loading branch information
bbannier committed Nov 16, 2022
1 parent ec3eca0 commit b94c8bc
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,10 @@ CheckOptionalBuildSources(auxil/zeek-archiver ZeekArchiver INSTALL_ZEEK_ARCHIVER
CheckOptionalBuildSources(auxil/zeek-client ZeekClient INSTALL_ZEEK_CLIENT)

if ( NOT DISABLE_SPICY )
# The `zeek` binary implicitly depends on the driver object file built
# as part of `spicy`; make that dependency explicit.
add_dependencies(zeek spicyz)

if ( NOT SPICY_ROOT_DIR )
list(APPEND _spicy_rt_libs spicy-rt hilti-rt)

Expand Down

0 comments on commit b94c8bc

Please sign in to comment.