From owner-svn-src-projects@FreeBSD.ORG Fri May 16 14:53:15 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE99093F; Fri, 16 May 2014 14:53:15 +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 9CC882785; Fri, 16 May 2014 14:53:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GErFxw082819; Fri, 16 May 2014 14:53:15 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GErFPK082818; Fri, 16 May 2014 14:53:15 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201405161453.s4GErFPK082818@svn.freebsd.org> From: "Simon J. Gerraty" Date: Fri, 16 May 2014 14:53:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r266229 - projects/bmake/share/mk 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 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 May 2014 14:53:15 -0000 Author: sjg Date: Fri May 16 14:53:15 2014 New Revision: 266229 URL: http://svnweb.freebsd.org/changeset/base/266229 Log: Include src.opts.mk and handle MK_SYSROOT. Modified: projects/bmake/share/mk/local.init.mk Modified: projects/bmake/share/mk/local.init.mk ============================================================================== --- projects/bmake/share/mk/local.init.mk Fri May 16 14:52:18 2014 (r266228) +++ projects/bmake/share/mk/local.init.mk Fri May 16 14:53:15 2014 (r266229) @@ -1,4 +1,6 @@ +.include "src.opts.mk" + .if defined(.PARSEDIR) .if ${.MAKE.MODE:Mmeta*} != "" .if !empty(SUBDIR) && !defined(LIB) && !defined(PROG) && ${.MAKE.MAKEFILES:M*bsd.prog.mk} == "" @@ -10,7 +12,22 @@ .endif .endif +.if ${MK_SYSROOT} == "yes" && !empty(SYSROOT) +CFLAGS_LAST+= --sysroot=${SYSROOT} +CXXFLAGS_LAST+= --sysroot=${SYSROOT} +LDADD+= --sysroot=${SYSROOT} +.if ${MACHINE} == "host" +# we cheat? +LDADD+= -B/usr/lib +CFLAGS_LAST+= -I/usr/include +CXXFLAGS_LAST+= -I/usr/include +.endif +.endif + .if ${MACHINE} == "host" +.if ${.MAKE.DEPENDFILE:E} != "host" +UPDATE_DEPENDFILE?= no +.endif HOST_CC?= /usr/bin/cc HOST_CFLAGS+= -DHOSTPROG CC= ${HOST_CC}