Page MenuHomeFreeBSD

D38738.diff
No OneTemporary

D38738.diff

diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile
--- a/sys/modules/cxgbe/if_cxgbe/Makefile
+++ b/sys/modules/cxgbe/if_cxgbe/Makefile
@@ -23,9 +23,7 @@
SRCS+= t4_hw.c
SRCS+= t4_if.c t4_if.h
SRCS+= t4_iov.c
-.if ${KERN_OPTS:MKERN_TLS} != ""
-SRCS+= t6_kern_tls.c
-.endif
+SRCS.KERN_TLS+= t6_kern_tls.c
SRCS+= t4_keyctx.c
SRCS+= t4_l2t.c
SRCS+= t4_main.c
diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile
--- a/sys/modules/geom/geom_uzip/Makefile
+++ b/sys/modules/geom/geom_uzip/Makefile
@@ -10,10 +10,8 @@
g_uzip_wrkthr.h
# This works for buildkernel, but will disable zstd in geom_uzip out of tree.
-.if ${KERN_OPTS:MZSTDIO} != ""
-SRCS+= g_uzip_zstd.c g_uzip_zstd.h
+SRCS.ZSTDIO+= g_uzip_zstd.c g_uzip_zstd.h
CFLAGS.g_uzip_zstd.c+= -I${SRCTOP}/sys/contrib/zstd/lib/freebsd
-.endif
#CFLAGS= -g -DINVARIANT_SUPPORT -DINVARIANTS
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile
--- a/sys/modules/vmm/Makefile
+++ b/sys/modules/vmm/Makefile
@@ -61,9 +61,7 @@
amdvi_hw.c \
svm_msr.c
-.if ${KERN_OPTS:MBHYVE_SNAPSHOT} != ""
-SRCS+= vmm_snapshot.c
-.endif
+SRCS.BHYVE_SNAPSHOT= vmm_snapshot.c
CLEANFILES= vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 16, 5:01 PM (21 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15827492
Default Alt Text
D38738.diff (1 KB)

Event Timeline