Date: Tue, 25 Nov 2014 19:01:50 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275063 - in projects/building-blocks: share/mk usr.sbin Message-ID: <201411251901.sAPJ1olk025624@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Nov 25 19:01:49 2014 New Revision: 275063 URL: https://svnweb.freebsd.org/changeset/base/275063 Log: Make src.opts.mk the source of truth for whether or not to build hyperv In particular, according to several Makefiles it can only be built/run on amd64 and i386/i386. It isn't supported on i386/pc98 Modified: projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/usr.sbin/Makefile.i386 Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 18:58:40 2014 (r275062) +++ projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 19:01:49 2014 (r275063) @@ -91,7 +91,6 @@ __DEFAULT_YES_OPTIONS = \ GPL_DTC \ GROFF \ HTML \ - HYPERV \ ICONV \ INET \ INET6 \ @@ -213,6 +212,13 @@ __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX .endif +# hyperv is only supported on amd64 and i386/i386 +.if ${__T} == "amd64" || (${__T} == "i386" && ${__TT} == "i386") +__DEFAULT_YES_OPTIONS+=HYPERV +.else +MK_HYPERV:= no +.endif + .include <bsd.mkopt.mk> # Modified: projects/building-blocks/usr.sbin/Makefile.i386 ============================================================================== --- projects/building-blocks/usr.sbin/Makefile.i386 Tue Nov 25 18:58:40 2014 (r275062) +++ projects/building-blocks/usr.sbin/Makefile.i386 Tue Nov 25 19:01:49 2014 (r275063) @@ -9,6 +9,9 @@ SUBDIR+= asf SUBDIR+= btxld .endif SUBDIR+= cpucontrol +.if ${MK_HYPERV} != "no" +SUBDIR+= hyperv +.endif SUBDIR+= kgmon SUBDIR+= kgzip SUBDIR+= lptcontrol @@ -28,9 +31,6 @@ SUBDIR+= zzz SUBDIR+= acpi .endif SUBDIR+= boot0cfg -.if ${MK_HYPERV} != "no" -SUBDIR+= hyperv -.endif .if ${MK_WIRELESS} != "no" SUBDIR+= wlconfig .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411251901.sAPJ1olk025624>