From 68b5cab72d6529a665dcc9882a9197f3b586927b Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Thu, 11 Aug 2022 15:06:08 +0000 Subject: [PATCH] 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. --- cli/main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cli/main.c b/cli/main.c index 5ed2bea..9e5a661 100644 --- a/cli/main.c +++ b/cli/main.c @@ -1136,12 +1136,7 @@ main(int argc, char *argv[]) pkgconf_client_set_buildroot_dir(&pkg_client, builddir); if ((want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE || - (want_flags & PKG_CFLAGS) == PKG_CFLAGS) - { - want_client_flags |= PKGCONF_PKG_PKGF_SEARCH_PRIVATE; - } - - if ((want_flags & PKG_CFLAGS)) + (want_flags & PKG_CFLAGS)) { want_client_flags |= PKGCONF_PKG_PKGF_SEARCH_PRIVATE; }