diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:31:30 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:31:30 +0000 |
| commit | f129a789c105c7ff2e51db559b51672fd36e511a (patch) | |
| tree | b5130deb320dfa807c4c7ae5f9b0695cf9d85276 /lib/zlib/Makefile | |
| parent | 8d55ac83ed57c82b2784e074751a33fe5e2dc21c (diff) | |
| download | nss-hg-f129a789c105c7ff2e51db559b51672fd36e511a.tar.gz | |
Bug 1629553 Merge simple config.mk files r=rrelyea
There is really no good reason to explicitly change the TARGET
variable. And the empty SHARED_LIBRARY variable should also be
in the manifest.mn to begin with.
All the other empty variables start empty or undefined, so there
is also no need to explicitly set them empty.
Differential Revision: https://phabricator.services.mozilla.com/D70691
Diffstat (limited to 'lib/zlib/Makefile')
| -rw-r--r-- | lib/zlib/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/zlib/Makefile b/lib/zlib/Makefile index 812c38fce..0aa8a85aa 100644 --- a/lib/zlib/Makefile +++ b/lib/zlib/Makefile @@ -25,7 +25,12 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk +EXTRA_LIBS = $(LIBRARY) + +ifneq ($(OS_ARCH),WINNT) +DEFINES += -DHAVE_UNISTD_H +endif +DEFINES += -DHAVE_STDARG_H ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # |