[llvm-commits] [release_12] CVS: llvm/runtime/zlib/Makefile

John Criswell criswell at cs.uiuc.edu
Wed Mar 17 17:13:16 PST 2004


Changes in directory llvm/runtime/zlib:

Makefile updated: 1.2 -> 1.2.4.1

---
Log message:

Defined the NO_DUMMY_DECL variable.  This removes the zlib hack that
for "bad compilers" that generates a type conflict resolution error when
linking zlib with gccld.



---
Diffs of the changes:  (+1 -0)

Index: llvm/runtime/zlib/Makefile
diff -u llvm/runtime/zlib/Makefile:1.2 llvm/runtime/zlib/Makefile:1.2.4.1
--- llvm/runtime/zlib/Makefile:1.2	Fri Feb 20 15:26:45 2004
+++ llvm/runtime/zlib/Makefile	Wed Mar 17 17:12:00 2004
@@ -11,6 +11,7 @@
 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





More information about the llvm-commits mailing list