Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

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

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

config/

	PR binutils/26301
	* pkg.m4 (PKG_CHECK_MODULES): Use AC_TRY_LINK only if
	$pkg_failed = no.

binutils/

	PR binutils/26301
	* configure: Regenerated.

gdb/

	PR binutils/26301
	* configure: Regenerated.
This commit is contained in:
H.J. Lu
2020-07-28 06:59:20 -07:00
parent 866b34a12d
commit 377170fa31
6 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/pkg.m4
View File

@@ -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.