From af63b799f12bf54f12fdbcfe4c600abd6aa5aa0f Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 9 Dec 2016 22:47:02 -0600
Subject: [PATCH] main: filter out system dir fragments instead of skipping
 them when printing

---
 main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/main.c b/main.c
index 12a9962..0192c45 100644
--- a/main.c
+++ b/main.c
@@ -73,7 +73,7 @@ error_handler(const char *msg)
 }
 
 static bool
-fragment_has_system_dir(pkgconf_fragment_t *frag)
+fragment_has_system_dir(const pkgconf_fragment_t *frag)
 {
 	int check_flags = 0;
 	pkgconf_list_t *check_paths = NULL;
@@ -101,9 +101,6 @@ fragment_has_system_dir(pkgconf_fragment_t *frag)
 static void
 print_fragment(pkgconf_fragment_t *frag)
 {
-	if (fragment_has_system_dir(frag))
-		return;
-
 	if (frag->type)
 		printf("-%c%s ", frag->type, frag->data);
 	else
@@ -152,6 +149,9 @@ filter_cflags(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, un
 	(void) client;
 	(void) flags;
 
+	if (fragment_has_system_dir(frag))
+		return false;
+
 	if (frag->type == 'I')
 		got_flags = PKG_CFLAGS_ONLY_I;
 	else
@@ -167,6 +167,9 @@ filter_libs(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, unsi
 	(void) client;
 	(void) flags;
 
+	if (fragment_has_system_dir(frag))
+		return false;
+
 	switch (frag->type)
 	{
 		case 'L': got_flags = PKG_LIBS_ONLY_LDPATH; break;