Merged in RELEASE_12.

This fixes the zlib linking problems.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@12531 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/runtime/zlib/Makefile b/runtime/zlib/Makefile
index ca08ff9b45f449f8ab85d9ed32a1bcc93153cab1..f9822d5c293328eb8a09a3c4f240e5a3fb00a546 100644 (file)
--- a/runtime/zlib/Makefile
+++ b/runtime/zlib/Makefile
@@ -11,6 +11,7 @@ BYTECODE_LIBRARY=1
 BUILD_ARCHIVE=1
 DONT_BUILD_RELINKED=1
 LIBRARYNAME=z
+CPPFLAGS += -DNO_DUMMY_DECL=1
 
 Source = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c trees.c \
          zutil.c inflate.c infback.c inftrees.c inffast.c