From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 4 May 2022 10:14:08 +0000 (+0200)
Subject: Control verbose flag passed to jlibtool
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5767114e550ec800db2ff1b356e2b16ac4979b21;p=thirdparty%2Ffreeradius-server.git

Control verbose flag passed to jlibtool
---

diff --git a/Make.inc.in b/Make.inc.in
index dc3f7040bd4..0d415e50872 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -181,7 +181,7 @@ ANALYZE.c       := @clang_path@
 #  Have wrappers for the test tools, so that they run.
 #
 TEST_BIN_DIR = ./$(BUILD_DIR)/bin/local
-TEST_BIN    =  $(JLIBTOOL) --quiet --mode=execute $(TEST_BIN_DIR)
+TEST_BIN    =  $(JLIBTOOL) $(if ${VERBOSE},--debug,--silent) --mode=execute $(TEST_BIN_DIR)
 
 #
 #  For creating documentation via doc/all.mk
diff --git a/scripts/libtool.mk b/scripts/libtool.mk
index 7b1907ad43a..acfc01d317e 100644
--- a/scripts/libtool.mk
+++ b/scripts/libtool.mk
@@ -70,12 +70,13 @@ clean.libs:
 
 # Re-define compilers and linkers
 #
+LIBTOOL_VERBOSE=$(if ${VERBOSE},--debug,--silent)
 OBJ_EXT = lo
-COMPILE.c = ${LIBTOOL} --silent --mode=compile ${CC}
-COMPILE.cxx = ${LIBTOOL} --mode=compile ${CXX}
-LINK.c = ${LIBTOOL} --silent --mode=link ${CC}
-LINK.cxx = ${LIBTOOL} --mode=link ${CXX}
-PROGRAM_INSTALL = ${LIBTOOL} --silent --mode=install ${INSTALL}
+COMPILE.c = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=compile ${CC}
+COMPILE.cxx = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=compile ${CXX}
+LINK.c = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=link ${CC}
+LINK.cxx = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=link ${CXX}
+PROGRAM_INSTALL = ${LIBTOOL} ${LIBTOOL_VERBOSE} --mode=install ${INSTALL}
 
 
 # LIBTOOL_ENDINGS - Given a library ending in ".a" or ".so", replace that
diff --git a/src/tests/radiusd.mk b/src/tests/radiusd.mk
index ce9eb671b58..000a42f6b51 100644
--- a/src/tests/radiusd.mk
+++ b/src/tests/radiusd.mk
@@ -46,7 +46,7 @@
 include Make.inc
 
 define RADIUSD_SERVICE
-$$(eval RADIUSD_BIN := $(JLIBTOOL) --silent --mode=execute $$(TEST_BIN)/radiusd)
+$$(eval RADIUSD_BIN := $(JLIBTOOL) $(if ${VERBOSE},--debug,--silent) --mode=execute $$(TEST_BIN)/radiusd)
 $(eval PORT := $(shell echo $$(($(PORT)+1))))
 $(eval $(subst test.,,$(TEST))_port := $(PORT))