From 7ee4fbcd309679fa70c1fc7ba012298fbc6b6bdb Mon Sep 17 00:00:00 2001 From: "wtchang%redhat.com" Date: Sat, 20 Aug 2005 01:05:44 +0000 Subject: [PATCH] Bugzilla bug 302670: backed out the use of system zlib because some Linux distributions are using zlib 1.1.4, which causes our signtool tests to fail intermittently. Don't know why. git-svn-id: svn://10.0.0.236/trunk@178324 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/coreconf/Linux.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk index 79528e187b7..50c8af544a9 100644 --- a/mozilla/security/coreconf/Linux.mk +++ b/mozilla/security/coreconf/Linux.mk @@ -55,7 +55,7 @@ DEFAULT_COMPILER = gcc ifeq ($(OS_TEST),m68k) OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE CPU_ARCH = m68k -else +else ifeq ($(OS_TEST),ppc64) OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE CPU_ARCH = ppc @@ -175,6 +175,3 @@ G++INCLUDES = -I/usr/include/g++ # Always set CPU_TAG on Linux, OpenVMS, WINCE. # CPU_TAG = _$(CPU_ARCH) - -USE_SYSTEM_ZLIB = 1 -ZLIB_LIBS = -lz