Author: bdrewery
Date: Tue Dec 5 17:23:33 2017
New Revision: 326569
URL: https://svnweb.freebsd.org/changeset/base/326569
Log:
Fix cyclic dependency after r326552.
The OBJS_DEPEND_GUESS mechanism was making vmx_genassym.o depend
on all headers along with vmx_assym.h, though vmx_assym.h depends
on having vmx_genassym.o present to generate. Moving the headers
to DPSRCS is enough to resolve the issue as they will no longer
be implicit dependencies for all objects. Because of this we
need explicit OBJS_DEPEND_GUESS entries to ensure the headers
are generated when needed for the *_support.o files that need
them.
X-MFC-With: r326552
MFC after: 2 weeks
Sponsored by: Dell EMC
Modified:
head/sys/modules/vmm/Makefile
Modified: head/sys/modules/vmm/Makefile
==============================================================================
--- head/sys/modules/vmm/Makefile Tue Dec 5 14:46:12 2017
(r326568)
+++ head/sys/modules/vmm/Makefile Tue Dec 5 17:23:33 2017
(r326569)
@@ -3,8 +3,8 @@
KMOD= vmm
SRCS= opt_acpi.h opt_ddb.h device_if.h bus_if.h pci_if.h pcib_if.h acpi_if.h
-SRCS+= vmx_assym.h svm_assym.h
-DPSRCS= vmx_genassym.c svm_genassym.c
+DPSRCS+= vmx_assym.h svm_assym.h
+DPSRCS+= vmx_genassym.c svm_genassym.c
CFLAGS+= -DVMM_KEEP_STATS -DSMP
CFLAGS+= -I${SRCTOP}/sys/amd64/vmm
@@ -56,6 +56,9 @@ SRCS+= vmcb.c \
svm_msr.c
CLEANFILES= vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o
+
+OBJS_DEPEND_GUESS.vmx_support.o+= vmx_assym.h
+OBJS_DEPEND_GUESS.svm_support.o+= svm_assym.h
vmx_assym.h: vmx_genassym.o
sh ${SYSDIR}/kern/genassym.sh vmx_genassym.o > ${.TARGET}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
