From owner-svn-src-projects@FreeBSD.ORG  Tue Nov 25 19:01:50 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E987988F;
 Tue, 25 Nov 2014 19:01:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D7117866;
 Tue, 25 Nov 2014 19:01:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPJ1oHM025627;
 Tue, 25 Nov 2014 19:01:50 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPJ1olk025624;
 Tue, 25 Nov 2014 19:01:50 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411251901.sAPJ1olk025624@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 25 Nov 2014 19:01:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275063 - in projects/building-blocks: share/mk usr.sbin
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Nov 2014 19:01:51 -0000

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