diff options
author | EKR <ekr@rtfm.com> | 2016-01-31 17:24:05 -0800 |
---|---|---|
committer | EKR <ekr@rtfm.com> | 2016-01-31 17:24:05 -0800 |
commit | 36bcbbd187fe77aa1ca954481b93404657e2f3a7 (patch) | |
tree | 07e74edd1435feb8a7b2219bc7d12262c7eefecd /cmd/modutil | |
parent | 82439b68538230d49574fced23eec66b986fae36 (diff) | |
download | nss-hg-36bcbbd187fe77aa1ca954481b93404657e2f3a7.tar.gz |
Bug 1243872: Refactor zlib support in Makefiles. r=mt,wtc
Diffstat (limited to 'cmd/modutil')
-rw-r--r-- | cmd/modutil/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cmd/modutil/Makefile b/cmd/modutil/Makefile index 1a64b475f..fc7b4b122 100644 --- a/cmd/modutil/Makefile +++ b/cmd/modutil/Makefile @@ -23,13 +23,9 @@ include $(CORE_DEPTH)/coreconf/config.mk ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk -ifdef USE_SYSTEM_ZLIB -OS_LIBS += $(ZLIB_LIBS) -else -EXTRA_LIBS += $(ZLIB_LIBS) -endif +include ../platlibs.mk +include $(CORE_DEPTH)/coreconf/zlib.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # |