diff options
| -rw-r--r-- | isisd/subdir.am | 2 | ||||
| -rw-r--r-- | staticd/subdir.am | 2 | ||||
| -rw-r--r-- | tests/lib/test_grpc.cpp | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/isisd/subdir.am b/isisd/subdir.am index 3e7d9a90ec..e33cb76550 100644 --- a/isisd/subdir.am +++ b/isisd/subdir.am @@ -98,7 +98,7 @@ ISIS_SOURCES = \ isisd/isis_pfpacket.c \ # end -ISIS_LDADD_COMMON = lib/libfrr.la $(LIBCAP) +ISIS_LDADD_COMMON = lib/libfrr.la $(LIBCAP) $(LIBYANG_LIBS) # Building isisd diff --git a/staticd/subdir.am b/staticd/subdir.am index 022428281f..07ebe3c02c 100644 --- a/staticd/subdir.am +++ b/staticd/subdir.am @@ -36,7 +36,7 @@ clippy_scan += \ # end staticd_staticd_SOURCES = staticd/static_main.c -staticd_staticd_LDADD = staticd/libstatic.a lib/libfrr.la $(LIBCAP) +staticd_staticd_LDADD = staticd/libstatic.a lib/libfrr.la $(LIBCAP) $(LIBYANG_LIBS) nodist_staticd_staticd_SOURCES = \ yang/frr-bfdd.yang.c \ diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp index 182c1d338d..957ffdefaa 100644 --- a/tests/lib/test_grpc.cpp +++ b/tests/lib/test_grpc.cpp @@ -92,6 +92,17 @@ static void static_startup(void) grpc_module = frrmod_load("grpc:50051", modpath.c_str(), _err_print, 0); } + if (!grpc_module) { + modpath = std::string(binpath) + + std::string("../../../lib/.libs"); + grpc_module = frrmod_load("grpc:50051", modpath.c_str(), + _err_print, 0); + } + if (!grpc_module) { + modpath = std::string(binpath) + std::string("../../../lib"); + grpc_module = frrmod_load("grpc:50051", modpath.c_str(), + _err_print, 0); + } if (!grpc_module) exit(1); |