summaryrefslogtreecommitdiffstats
path: root/fpm
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2021-07-21 11:04:23 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2021-07-21 17:10:08 +0200
commit63116a7008706988136785ffa011cefee0355193 (patch)
treebb9cd12975d5560d4c3df5d2c9e5d0e32cea33cf /fpm
parentMerge pull request #8956 from pguibert6WIND/bgp_loop_through_itself (diff)
downloadfrr-63116a7008706988136785ffa011cefee0355193.tar.xz
frr-63116a7008706988136785ffa011cefee0355193.zip
build: fix `AM_LDFLAGS` usage (and gcov)
like the other automake variables, setting `xyz_LDFLAGS` causes `AM_LDFLAGS` to be ignored for `xyz`. For some reason I had in my mind that automake doesn't do this for LDFLAGS, but... it does. (Which is consistent with `_CFLAGS` and co.) So, all the libraries and modules have been ignoring `AM_LDFLAGS` (which includes `SAN_FLAGS` too). Set up new `LIB_LDFLAGS` and `MODULE_LDFLAGS` to handle all of this correctly (and move these bits to a central location.) Fixes: #9034 Fixes: 0c4285d77eb ("build: properly split CFLAGS from AC_CFLAGS") Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'fpm')
-rw-r--r--fpm/subdir.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/fpm/subdir.am b/fpm/subdir.am
index a645ca2b0..b5988137e 100644
--- a/fpm/subdir.am
+++ b/fpm/subdir.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES += fpm/libfrrfpm_pb.la
endif
endif
-fpm_libfrrfpm_pb_la_LDFLAGS = -version-info 0:0:0
+fpm_libfrrfpm_pb_la_LDFLAGS = $(LIB_LDFLAGS) -version-info 0:0:0
fpm_libfrrfpm_pb_la_CPPFLAGS = $(AM_CPPFLAGS) $(PROTOBUF_C_CFLAGS)
fpm_libfrrfpm_pb_la_SOURCES = \
fpm/fpm.h \