stand: constrain zlib/gzip CFLAGS better
Define ZLIB_CFLAGS and use it only for the sources that are in ZLIB or that include it. Sponsored by: Netflix
This commit is contained in:
parent
59a4cfe03c
commit
84bf2bbbec
@ -96,9 +96,11 @@ SRCS+=${i}
|
|||||||
|
|
||||||
# decompression functionality from zlib
|
# decompression functionality from zlib
|
||||||
.PATH: ${SRCTOP}/sys/contrib/zlib
|
.PATH: ${SRCTOP}/sys/contrib/zlib
|
||||||
CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib
|
ZLIB_CFLAGS=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib
|
||||||
SRCS+= adler32.c crc32.c
|
.for i in adler32.c crc32.c infback.c inffast.c inflate.c inftrees.c zutil.c
|
||||||
SRCS+= infback.c inffast.c inflate.c inftrees.c zutil.c
|
CFLAGS.${i}+=${ZLIB_CFLAGS}
|
||||||
|
SRCS+= ${i}
|
||||||
|
.endfor
|
||||||
|
|
||||||
# lz4 decompression functionality
|
# lz4 decompression functionality
|
||||||
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4
|
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4
|
||||||
@ -168,9 +170,8 @@ SRCS+= time.c
|
|||||||
.PATH: ${SRCTOP}/sys/ufs/ffs
|
.PATH: ${SRCTOP}/sys/ufs/ffs
|
||||||
SRCS+=ffs_subr.c ffs_tables.c
|
SRCS+=ffs_subr.c ffs_tables.c
|
||||||
|
|
||||||
CFLAGS.dosfs.c+= -I${LDRSRC}
|
CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS}
|
||||||
CFLAGS.tftp.c+= -I${LDRSRC}
|
CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS}
|
||||||
CFLAGS.ufs.c+= -I${LDRSRC}
|
|
||||||
CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS
|
CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS
|
||||||
|
|
||||||
# explicit_bzero and calculate_crc32c
|
# explicit_bzero and calculate_crc32c
|
||||||
|
Loading…
Reference in New Issue
Block a user