diff options
| author |  apolcyn <apolcyn@google.com> | 2018-05-17 11:54:45 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-17 11:54:45 -0700 |
| commit | fe3c66659d586e963843a3ec0579152254fbc55c (patch) | |
| tree | c82da15dda32d387e4a8c288e14b3b2000dfba54 /templates | |
| parent | 3fd27cea762fef9d860dd9b0dd4b183ffb1dd245 (diff) | |
| parent | 80f9c2a00b23b55e27678ad420cc8093a0d05c1e (diff) | |
Merge pull request #15422 from apolcyn/fix_circular_makefile_dep
Fix a makefile circular dependency
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 354f2a2f40..901dbfc9c8 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1503,13 +1503,9 @@ % endif $(LIBDIR)/$(CONFIG)/lib${lib.name}.a: \ - % if lib.name != 'z': + % if lib.name not in ['z', 'ares', 'address_sorting']: $(ZLIB_DEP) \ - % endif - % if lib.name != 'ares': $(CARES_DEP) \ - % endif - % if lib.name != 'address_sorting': $(ADDRESS_SORTING_DEP) \ % endif % endif |