Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 May 2016 23:20:27 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r300803 - head/share/mk
Message-ID:  <201605262320.u4QNKRoJ070254@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605262320.u4QNKRoJ070254>