From: David Lamparter <equinox@diac24.net>
Date: Fri, 9 Apr 2021 17:56:05 +0000 (+0200)
Subject: build: don't link pathd/path_main.c twice
X-Git-Tag: base_8.0~156^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=636aad94735aff8aeec911bca4c32f4e5e48d77c;p=mirror%2Ffrr.git

build: don't link pathd/path_main.c twice

Can't have things duplicate in libpath.a and pathd directly, they'll
crash into eath other on linking.  No idea why this doesn't error out in
our CI builds, but it definitely breaks LTO builds.

Signed-off-by: David Lamparter <equinox@diac24.net>
---

diff --git a/pathd/subdir.am b/pathd/subdir.am
index b4501214bf..fdc08e9e97 100644
--- a/pathd/subdir.am
+++ b/pathd/subdir.am
@@ -22,7 +22,6 @@ pathd_libpath_a_SOURCES = \
 	pathd/path_cli.c \
 	pathd/path_debug.c \
 	pathd/path_errors.c \
-	pathd/path_main.c \
 	pathd/path_nb.c \
 	pathd/path_nb_config.c \
 	pathd/path_nb_state.c \
@@ -50,7 +49,9 @@ noinst_HEADERS += \
 	pathd/pathd.h \
 	# end
 
-pathd_pathd_SOURCES = pathd/path_main.c
+pathd_pathd_SOURCES = \
+	pathd/path_main.c \
+	# end
 nodist_pathd_pathd_SOURCES = \
 	yang/frr-pathd.yang.c \
 	# end