Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 7820fc268fae4353118b6355f1d4b9e1b7eeebec Mon Sep 17 00:00:00 2001 |
| 2 | From: Philippe Waroquiers <philippe.waroquiers@skynet.be> |
| 3 | Date: Sun, 28 Oct 2018 18:35:11 +0100 |
| 4 | Subject: [PATCH] Fix dependencies between libcoregrind*.a and |
| 5 | *m_main.o/*m_libcsetjmp.o |
| 6 | |
| 7 | The primary and secondary coregrind libraries must be updated |
| 8 | when m_main.c or m_libcsetjmp.c are changed. |
| 9 | |
| 10 | A dependency was missing between libcoregrind*.a and libnolto_coregrind*.a, |
| 11 | and so tools were not relinked when m_main.c or m_libcsetjmp.c were |
| 12 | changed. |
| 13 | |
| 14 | Upstream-Status: Backport[git://sourceware.org/git/valgrind.git 7820fc268fae4353118b6355f1d4b9e1b7eeebec] |
| 15 | |
| 16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 17 | --- |
| 18 | coregrind/Makefile.am | 4 ++++ |
| 19 | 1 file changed, 4 insertions(+) |
| 20 | |
| 21 | diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am |
| 22 | index 914a270..8de1996 100644 |
| 23 | --- a/coregrind/Makefile.am |
| 24 | +++ b/coregrind/Makefile.am |
| 25 | @@ -511,6 +511,8 @@ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS += \ |
| 26 | endif |
| 27 | libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_LIBADD = \ |
| 28 | $(libnolto_coregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_OBJECTS) |
| 29 | +libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_DEPENDENCIES = \ |
| 30 | + libnolto_coregrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a |
| 31 | |
| 32 | if VGCONF_HAVE_PLATFORM_SEC |
| 33 | libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \ |
| 34 | @@ -531,6 +533,8 @@ libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS += \ |
| 35 | endif |
| 36 | libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_LIBADD = \ |
| 37 | $(libnolto_coregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_OBJECTS) |
| 38 | +libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_DEPENDENCIES = \ |
| 39 | + libnolto_coregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a |
| 40 | endif |
| 41 | |
| 42 | #---------------------------------------------------------------------------- |
| 43 | -- |
| 44 | 2.10.2 |
| 45 | |