forked from ariadne/pkgconf
main: properly honour --keep-system-libs and --keep-system-cflags
parent
6c2bc94cc3
commit
492d220d73
4
main.c
4
main.c
|
@ -108,7 +108,7 @@ filter_cflags(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, vo
|
||||||
(void) data;
|
(void) data;
|
||||||
(void) flags;
|
(void) flags;
|
||||||
|
|
||||||
if (pkgconf_fragment_has_system_dir(client, frag))
|
if (!(want_flags & PKG_KEEP_SYSTEM_CFLAGS) && pkgconf_fragment_has_system_dir(client, frag))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (frag->type == 'I')
|
if (frag->type == 'I')
|
||||||
|
@ -127,7 +127,7 @@ filter_libs(const pkgconf_client_t *client, const pkgconf_fragment_t *frag, void
|
||||||
(void) data;
|
(void) data;
|
||||||
(void) flags;
|
(void) flags;
|
||||||
|
|
||||||
if (pkgconf_fragment_has_system_dir(client, frag))
|
if (!(want_flags & PKG_KEEP_SYSTEM_LIBS) && pkgconf_fragment_has_system_dir(client, frag))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
switch (frag->type)
|
switch (frag->type)
|
||||||
|
|
Loading…
Reference in New Issue