From 3802fd8751536f57af0725a4c04afe5a57f41fb1 Mon Sep 17 00:00:00 2001 From: Florian Krohm Date: Wed, 26 Mar 2025 15:11:29 +0000 Subject: [PATCH] Fix library dependency for vbit-test and disasm-test. The executables were not relinked when the library was updated. --- memcheck/tests/vbit-test/Makefile.am | 5 +++-- none/tests/s390x/disasm-test/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/memcheck/tests/vbit-test/Makefile.am b/memcheck/tests/vbit-test/Makefile.am index d3bc4c51ff..ded4ab1747 100644 --- a/memcheck/tests/vbit-test/Makefile.am +++ b/memcheck/tests/vbit-test/Makefile.am @@ -49,7 +49,7 @@ vbit_test_CPPFLAGS = $(AM_CPPFLAGS_PRI) \ -I$(top_srcdir)/memcheck \ -I$(top_srcdir)/VEX/pub vbit_test_CFLAGS = $(AM_CFLAGS_PRI) -vbit_test_DEPENDENCIES = +vbit_test_DEPENDENCIES = $(top_builddir)/VEX/libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a vbit_test_LDADD = $(top_builddir)/VEX/libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a vbit_test_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ # If there is no secondary platform, and the platforms include x86-darwin, @@ -69,7 +69,8 @@ vbit_test_sec_CPPFLAGS = $(AM_CPPFLAGS_SEC) \ -I$(top_srcdir)/VEX/pub vbit_test_sec_CFLAGS = $(AM_CFLAGS_SEC) \ $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -vbit_test_sec_DEPENDENCIES = +vbit_test_sec_DEPENDENCIES = $(top_builddir)/VEX/libvex-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a \ + $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) vbit_test_sec_LDADD = $(top_builddir)/VEX/libvex-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) vbit_test_sec_LDFLAGS = $(AM_CFLAGS_SEC) @LIB_UBSAN@ \ diff --git a/none/tests/s390x/disasm-test/Makefile.am b/none/tests/s390x/disasm-test/Makefile.am index 7758489219..ce662cb860 100644 --- a/none/tests/s390x/disasm-test/Makefile.am +++ b/none/tests/s390x/disasm-test/Makefile.am @@ -30,6 +30,6 @@ disasm_test_CPPFLAGS = $(AM_CPPFLAGS_PRI) \ -I$(top_srcdir)/VEX/pub \ -I$(top_srcdir)/VEX/priv disasm_test_CFLAGS = $(AM_CFLAGS_PRI) -disasm_test_DEPENDENCIES = +disasm_test_DEPENDENCIES = $(top_builddir)/VEX/libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a disasm_test_LDADD = $(top_builddir)/VEX/libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a disasm_test_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ -- 2.47.2