From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 19 Apr 2022 20:03:01 +0000 (+0200)
Subject: Bug 452779 Valgrind fails to build on FreeBSD 13.0 with llvm-devel (15.0.0)
X-Git-Tag: VALGRIND_3_20_0~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dbc46750f7f716ae3b9cf718380df77422379da;p=thirdparty%2Fvalgrind.git

Bug 452779 Valgrind fails to build on FreeBSD 13.0 with llvm-devel (15.0.0)

This fixes building.

I may make the -lgcc and libgcc-sup conditonal on not using clang later.
---

diff --git a/Makefile.tool.am b/Makefile.tool.am
index fe5f002cec..5ce32d9c35 100644
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -16,14 +16,14 @@ TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@ = \
 	$(top_builddir)/VEX/libvex-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
 endif
 
-
-TOOL_LDADD_COMMON = -lgcc \
-	$(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
+TOOL_LDADD_COMMON = -lgcc
 TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@ = \
-	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON)
+	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON) \
+	$(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
 if VGCONF_HAVE_PLATFORM_SEC
 TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \
-	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON)
+	$(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON) \
+	$(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
 endif