dcbaker
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cli: remove redundant SEARCH_PRIVATE block 

It turns out there was already a check for PKG_CFLAGS being requested,
but the check was busted because PKG_CFLAGS is a combined-or of all of
the various --cflags flags.

Check that PKG_CFLAGS bits are set at all on want_flags instead.
master
Ariadne Conill 2022-08-11 15:06:08 +00:00
parent 78f00da130
commit 68b5cab72d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli/main.c
View File

@ -1136,12 +1136,7 @@ main(int argc, char *argv[])
pkgconf_client_set_buildroot_dir(&pkg_client, builddir); pkgconf_client_set_buildroot_dir(&pkg_client, builddir);
if ((want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE || if ((want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE ||
(want_flags & PKG_CFLAGS) == PKG_CFLAGS) (want_flags & PKG_CFLAGS))
{
want_client_flags |= PKGCONF_PKG_PKGF_SEARCH_PRIVATE;
}
if ((want_flags & PKG_CFLAGS))
{ {
want_client_flags |= PKGCONF_PKG_PKGF_SEARCH_PRIVATE; want_client_flags |= PKGCONF_PKG_PKGF_SEARCH_PRIVATE;
} }