From owner-svn-src-all@freebsd.org Thu May 26 23:20:28 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1738B48217; Thu, 26 May 2016 23:20:28 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 5548618BB; Thu, 26 May 2016 23:20:28 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4QNKRoK070255; Thu, 26 May 2016 23:20:27 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4QNKRoJ070254; Thu, 26 May 2016 23:20:27 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201605262320.u4QNKRoJ070254@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 26 May 2016 23:20:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300803 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2016 23:20:28 -0000 Author: bdrewery Date: Thu May 26 23:20:27 2016 New Revision: 300803 URL: https://svnweb.freebsd.org/changeset/base/300803 Log: Pass CC/CXX/CFLAGS/CXXFLAGS/LDFLAGS to the main crunch exec build. This fixes --sysroot and other CFLAGS/LDFLAGS not being respected in the crunchgen build since it is not including bsd.sys.mk and other files. For example, this fixes building rescue itself without --sysroot and other CFLAGS. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.crunchgen.mk Modified: head/share/mk/bsd.crunchgen.mk ============================================================================== --- head/share/mk/bsd.crunchgen.mk Thu May 26 23:20:24 2016 (r300802) +++ head/share/mk/bsd.crunchgen.mk Thu May 26 23:20:27 2016 (r300803) @@ -114,7 +114,10 @@ ${OUTPUTS}: ${CONF} # These 2 targets cannot use .MAKE since they depend on the generated # ${OUTMK} above. ${PROG}: ${OUTPUTS} objs - ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f ${OUTMK} exe + ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \ + CC="${CC} ${CFLAGS} ${LDFLAGS}" \ + CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}" \ + ${MAKE} -f ${OUTMK} exe objs: ${OUTMK} ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} -f ${OUTMK} objs