diff options
| author | wtchang%redhat.com <devnull@localhost> | 2005-08-20 01:05:44 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2005-08-20 01:05:44 +0000 |
| commit | b490ded16442f1c986e97481d3e4272b329dc515 (patch) | |
| tree | 8b08183b56523b15bac7a1f2c896cf77705c64e1 /security/coreconf | |
| parent | 57d8905cc4ad48cfe4b7b1e582b119e1bac6ec0c (diff) | |
| download | nss-hg-b490ded16442f1c986e97481d3e4272b329dc515.tar.gz | |
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.
Diffstat (limited to 'security/coreconf')
| -rw-r--r-- | security/coreconf/Linux.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk index 79528e187..50c8af544 100644 --- a/security/coreconf/Linux.mk +++ b/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 |