From: Mark Wielaard Date: Sat, 3 Jan 2026 13:08:08 +0000 (+0100) Subject: VEX: Fix srcdir != builddir build X-Git-Tag: VALGRIND_3_27_0~275 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4fa4d04a6f636e680c407eb680c29da91c7e262a;p=thirdparty%2Fvalgrind.git VEX: Fix srcdir != builddir build commit 370531396ad1 ("s390: Use objdump machinery to disassemble insns") broke srcdir != builddir builds with: ../../../VEX/priv/objdump/s390-dis.c:26:10: fatal error: main_util.h: No such file or directory 26 | #include "main_util.h" // vex_strlen | ^~~~~~~~~~~~~ This comes from including the "wrong" priv directory for main_util.h in Makefile.vex.am. Fix this by adding -I$(srcdir)/priv. This was always wrong but didn't cause issues till now because of the extra objdump subdir. --- diff --git a/Makefile.vex.am b/Makefile.vex.am index 437053e03..f7371df78 100644 --- a/Makefile.vex.am +++ b/Makefile.vex.am @@ -203,13 +203,13 @@ LIBVEX_CFLAGS = ${LTO_CFLAGS} \ libvex_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = $(LIBVEX_SOURCES_COMMON) libvex_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -Ipriv + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -I$(srcdir)/priv libvex_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS = \ $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(LIBVEX_CFLAGS) if VGCONF_HAVE_PLATFORM_SEC libvex_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = $(LIBVEX_SOURCES_COMMON) libvex_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -Ipriv + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -I$(srcdir)/priv libvex_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS = \ $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(LIBVEX_CFLAGS) endif @@ -217,14 +217,14 @@ endif libvexmultiarch_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ $(LIBVEXMULTIARCH_SOURCES) libvexmultiarch_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -Ipriv + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -I$(srcdir)/priv libvexmultiarch_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS = \ $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(LIBVEX_CFLAGS) if VGCONF_HAVE_PLATFORM_SEC libvexmultiarch_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \ $(LIBVEXMULTIARCH_SOURCES) libvexmultiarch_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -Ipriv + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -I$(srcdir)/priv libvexmultiarch_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS = \ $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(LIBVEX_CFLAGS) endif