summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-05-26 23:20:27 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-05-26 23:20:27 +0000
commite3e1cdda997a6008be34259f8c35527141762b59 (patch)
treeb6b758ac01f2c17f71d63e1870a428d534d9a614 /share/mk
parent64873253970d2dc1623b5e69111f74d6f59d74cb (diff)
downloadFreeBSD-src-e3e1cdda997a6008be34259f8c35527141762b59.zip
FreeBSD-src-e3e1cdda997a6008be34259f8c35527141762b59.tar.gz
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
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.crunchgen.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk
index 76fe8be..e100595 100644
--- a/share/mk/bsd.crunchgen.mk
+++ b/share/mk/bsd.crunchgen.mk
@@ -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
OpenPOWER on IntegriCloud