summaryrefslogtreecommitdiffstats
path: root/lib/libz/Makefile
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2012-06-21 21:47:08 +0000
committerdelphij <delphij@FreeBSD.org>2012-06-21 21:47:08 +0000
commitf1aa6057552263943bc055b803d1254994d5f139 (patch)
tree77406785fe7cd37081c5a9cabb2dc128be5b4716 /lib/libz/Makefile
parent47822f6690f1e74d6e808a2d97e6ed1ce4ad5089 (diff)
parent5ecec51ae55e160069af12ac1c8fb3c4612e498d (diff)
downloadFreeBSD-src-f1aa6057552263943bc055b803d1254994d5f139.zip
FreeBSD-src-f1aa6057552263943bc055b803d1254994d5f139.tar.gz
MFV: Update zlib to 1.2.7.
(x86 assembler optimization disabled for now because it requires the new .cfi_* directives that is not supported by base system binutils). MFC after: 1 week
Diffstat (limited to 'lib/libz/Makefile')
-rw-r--r--lib/libz/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index e373e83..4ecb022 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,5 +1,5 @@
#
-# $FreeBSD$
+# $FreeBSD: head/lib/libz/Makefile 232263 2012-02-28 18:30:18Z dim $
#
LIB= z
@@ -35,12 +35,12 @@ SRCS+= uncompr.c
SRCS+= zopen.c
SRCS+= zutil.c
-.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
-.PATH: ${.CURDIR}/contrib/asm686
-SRCS+= match.S
-CFLAGS+= -DASMV -DNO_UNDERLINE
-ACFLAGS+= -Wa,--noexecstack
-.endif
+#.if ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU:M*i686*}
+#.PATH: ${.CURDIR}/contrib/asm686
+#SRCS+= match.S
+#CFLAGS+= -DASMV -DNO_UNDERLINE
+#ACFLAGS+= -Wa,--noexecstack
+#.endif
#.if ${MACHINE_ARCH} == "amd64"
#.PATH: ${.CURDIR}/contrib/gcc_gvmat64
OpenPOWER on IntegriCloud