diff mbox series

[21/24] PKG_CHECK_MODULES: Properly check if $pkg_cv_[]$1[]_LIBS works

Message ID 20230807105935.2098236-22-arsen@aarsen.me
State Unresolved
Headers
Series Sync shared build infrastructure with binutils-gdb |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Arsen Arsenović Aug. 7, 2023, 10:33 a.m. UTC 
  From: "H.J. Lu" <hjl.tools@gmail.com>

There is no need to check $pkg_cv_[]$1[]_LIBS works if package check
failed.

config/ChangeLog:

	* pkg.m4 (PKG_CHECK_MODULES): Use AC_TRY_LINK only if
	$pkg_failed = no.
---
 config/pkg.m4 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

Jeff Law Aug. 7, 2023, 5:54 p.m. UTC | #1 
On 8/7/23 04:33, Arsen Arsenović via Gcc-patches wrote:
> From: "H.J. Lu" <hjl.tools@gmail.com>
> 
> There is no need to check $pkg_cv_[]$1[]_LIBS works if package check
> failed.
> 
> config/ChangeLog:
> 
> 	* pkg.m4 (PKG_CHECK_MODULES): Use AC_TRY_LINK only if
> 	$pkg_failed = no.
OK.
jeff
diff mbox series

Patch

diff --git a/config/pkg.m4 b/config/pkg.m4
index 45587e97c8b..7ebf517cd6a 100644
--- a/config/pkg.m4
+++ b/config/pkg.m4
@@ -148,10 +148,12 @@  _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
 
 dnl Check whether $pkg_cv_[]$1[]_LIBS works.
-pkg_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $pkg_cv_[]$1[]_LIBS"
-AC_TRY_LINK([],[return 0;], [pkg_failed=no], [pkg_failed=yes])
-LDFLAGS=$pkg_save_LDFLAGS
+if test $pkg_failed = no; then
+  pkg_save_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $pkg_cv_[]$1[]_LIBS"
+  AC_TRY_LINK([],[], [], [pkg_failed=yes])
+  LDFLAGS=$pkg_save_LDFLAGS
+fi
 
 m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
 and $1[]_LIBS to avoid the need to call pkg-config.