Date: Thu, 8 Nov 2012 21:38:26 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242799 - projects/bmake/share/mk Message-ID: <201211082138.qA8LcQDm029062@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Thu Nov 8 21:38:26 2012 New Revision: 242799 URL: http://svnweb.freebsd.org/changeset/base/242799 Log: Need CXXFLAGS_LAST and LDFLAGS_LAST Modified: projects/bmake/share/mk/local.sys.mk Modified: projects/bmake/share/mk/local.sys.mk ============================================================================== --- projects/bmake/share/mk/local.sys.mk Thu Nov 8 21:36:19 2012 (r242798) +++ projects/bmake/share/mk/local.sys.mk Thu Nov 8 21:38:26 2012 (r242799) @@ -140,16 +140,18 @@ STAGE_INCSDIR= ${STAGE_OBJTOP}${INCSDIR: CFLAGS_LAST+= -nostdinc .endif CFLAGS_LAST+= -isystem ${STAGE_OBJTOP}/usr/include -isystem ${STAGE_OBJTOP}/include -LDFLAGS+= -B${STAGE_LIBDIR} -L${STAGE_LIBDIR} +LDFLAGS_LAST+= -B${STAGE_LIBDIR} -L${STAGE_LIBDIR} +CXXFLAGS_LAST+= -isystem ${STAGE_OBJTOP}/usr/include/c++/${GCCVER:U4.2} .else # if ld suppored sysroot, this would suffice CFLAGS_LAST+= --sysroot=${STAGE_OBJTOP} -isystem ${STAGE_OBJTOP}/include .endif .endif - +.if ${USE_META:Uyes} == "yes" .include "meta.sys.mk" +.endif -# most dirs can be satisfied with one Makefile.depend ? +# most dirs can be satisfied with one Makefile.depend .undef .MAKE.DEPENDFILE .MAKE.DEPENDFILE_PREFERENCE = \ ${.MAKE.DEPENDFILE_PREFIX} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211082138.qA8LcQDm029062>