diff --git a/CHANGES b/CHANGES index 99f39682a..3e8f8b4b7 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +1.9.0-dev.157 | 2023-10-23 10:58:57 +0200 + + * Fix spicy-build to correctly infer library directory. (Robin Sommer, Corelight) + + Closes https://github.com/zeek/zeek/issues/3384. + 1.9.0-dev.155 | 2023-10-23 10:54:13 +0200 * GH-1565: Disable capturing backtraces with HILTI exceptions in non-debug builds. (Robin Sommer, Corelight) diff --git a/VERSION b/VERSION index fdaf8c985..772c3576d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9.0-dev.155 +1.9.0-dev.157 diff --git a/spicy/toolchain/bin/spicy-build b/spicy/toolchain/bin/spicy-build index c49c6e3e2..1fc6fcf93 100755 --- a/spicy/toolchain/bin/spicy-build +++ b/spicy/toolchain/bin/spicy-build @@ -117,7 +117,7 @@ fi cxx="$(${spicy_config} --cxx ${spicy_config_flags}) $(${spicy_config} --cxxflags ${spicy_config_flags})" ldflags="$(${spicy_config} --ldflags ${spicy_config_flags})" -spicy_lib_dir=$(${spicy_config} --libdirs | sed 's/^\. //g') # A bit of a hack to get the dir we want ... +spicy_lib_dir=$(for i in $(${spicy_config} --libdirs); do test -e "${i}/spicy_rt.hlt" && echo "${i}" && break; done) # extract the directory we want spicy_driver=${spicy_lib_dir}/spicy-driver-host.cc rt_modules=""