Merge branch 'master' of github.com:libvips/libvips

jcupitt · jcupitt · commit fc2a69b35f5b · 2025-08-02T14:07:28.000+01:00
diff --git a/fuzz/oss_fuzz_build.sh b/fuzz/oss_fuzz_build.sh
@@ -188,15 +188,13 @@ cmake \
 cmake --build . --target install
 popd
 
-# FIXME: Workaround for https://github.com/mesonbuild/meson/issues/14640
-export LDFLAGS+=" -Wl,-rpath=\$ORIGIN/lib"
-
 # libvips
 # Disable building man pages, gettext po files, tools, and tests
 sed -i "/subdir('man')/{N;N;N;d;}" meson.build
 meson setup build --prefix=$WORK --libdir=lib --prefer-static --default-library=static --buildtype=debugoptimized \
   -Dbackend_max_links=4 -Ddeprecated=false -Dexamples=false -Dcplusplus=false -Dmodules=disabled \
-  -Dfuzzing_engine=oss-fuzz -Dfuzzer_ldflags="$LIB_FUZZING_ENGINE"
+  -Dfuzzing_engine=oss-fuzz -Dfuzzer_ldflags="$LIB_FUZZING_ENGINE" \
+  -Dcpp_link_args="$LDFLAGS -Wl,-rpath=\$ORIGIN/lib"
 meson install -C build --tag devel
 
 # Copy fuzz executables to $OUT
