Date: Fri, 5 Feb 2016 08:32:18 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r295311 - user/ngie/stable-10-libnv/sys/boot/ia64/efi Message-ID: <201602050832.u158WIKH028221@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Feb 5 08:32:17 2016 New Revision: 295311 URL: https://svnweb.freebsd.org/changeset/base/295311 Log: Add more MK_ZFS bits from r294999 Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Modified: user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile ============================================================================== --- user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:25:20 2016 (r295310) +++ user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile Fri Feb 5 08:32:17 2016 (r295311) @@ -7,7 +7,22 @@ MK_SSP= no PROG= loader.sym INTERNALPROG= + +.if ${MK_ZFS} != "no" +# Disable warnings that are currently incompatible with the zfs boot code +CWARNFLAGS.zfs_module.c += -Wno-array-bounds +CWARNFLAGS.zfs_module.c += -Wno-cast-align +CWARNFLAGS.zfs_module.c += -Wno-cast-qual +CWARNFLAGS.zfs_module.c += -Wno-missing-prototypes +CWARNFLAGS.zfs_module.c += -Wno-sign-compare +CWARNFLAGS.zfs_module.c += -Wno-unused-parameter +CWARNFLAGS.zfs_module.c += -Wno-unused-function +.endif + SRCS= conf.c efimd.c main.c pal.S start.S vers.c +.if ${MK_ZFS} != "no" +SRCS+= zfs_module.c +.endif .PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} @@ -18,6 +33,12 @@ CFLAGS+= -I${.CURDIR}/../../efi/include/ CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= -I${.CURDIR}/../../../../lib/libstand +.if ${MK_ZFS} != "no" +CFLAGS+= -I${.CURDIR}/../../zfs/ +CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs/ +CFLAGS+= -DEFI_ZFS_BOOT +.endif + LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_CPUARCH} LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602050832.u158WIKH028221>