diff options
author | Toomas Soome <tsoome@FreeBSD.org> | 2020-03-19 21:05:11 +0000 |
---|---|---|
committer | Toomas Soome <tsoome@FreeBSD.org> | 2020-03-19 21:05:11 +0000 |
commit | 27bae6150a9fd352796b5ff775eb464a2cf6dac9 (patch) | |
tree | afc3239908ef86eea352b0194e91c35594473b4b /stand/efi | |
parent | 6fb7b4fbdbf033fd0a41e805c0726f174f59628c (diff) | |
download | src-test-27bae6150a9fd352796b5ff775eb464a2cf6dac9.tar.gz src-test-27bae6150a9fd352796b5ff775eb464a2cf6dac9.zip |
loader: remove libsa/crc32.c and use version from zlib
we have crc32(const void *, size_t) in libsa. Unfortunately zlib has
crc32(long, const unigned char *, unsigned) and we have conflict.
Since we do build libsa with zlib, we can use zlib version instead.
Reviewed by: allanjude
Differential Revision: https://reviews.freebsd.org/D24068
Notes
Notes:
svn path=/head/; revision=359153
Diffstat (limited to 'stand/efi')
-rw-r--r-- | stand/efi/gptboot/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/stand/efi/gptboot/Makefile b/stand/efi/gptboot/Makefile index 7768cd50ab460..ba0df4ebeeebf 100644 --- a/stand/efi/gptboot/Makefile +++ b/stand/efi/gptboot/Makefile @@ -10,6 +10,7 @@ BOOT1?= gptboot CFLAGS+= -I${SRCTOP}/stand/efi/boot1 CFLAGS+= -I${.CURDIR} CFLAGS+= -DBOOTPROG=\"gptboot.efi\" +CFLAGS+= -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib SRCS+= gpt.c CWARNFLAGS.gpt.c+= -Wno-sign-compare -Wno-cast-align WARNS=6 |