Date: Sun, 13 Oct 2013 00:29:14 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256422 - projects/bmake/lib/libc Message-ID: <201310130029.r9D0TEDk068067@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Sun Oct 13 00:29:14 2013 New Revision: 256422 URL: http://svnweb.freebsd.org/changeset/base/256422 Log: We need an extra -I from lib/msun and we need to supress dependency on it - cyclic. Modified: projects/bmake/lib/libc/Makefile Modified: projects/bmake/lib/libc/Makefile ============================================================================== --- projects/bmake/lib/libc/Makefile Sun Oct 13 00:27:34 2013 (r256421) +++ projects/bmake/lib/libc/Makefile Sun Oct 13 00:29:14 2013 (r256422) @@ -158,7 +158,15 @@ CFLAGS+= -I${.CURDIR:H}/libutil # Same issue with libm MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${.CURDIR:H}/msun -V ARCH_SUBDIR # unfortunately msun/src contains both private and public headers -CFLAGS+= -I${.CURDIR:H}/msun/${MSUN_ARCH_SUBDIR} -I${.CURDIR:H}/msun/src +CFLAGS+= -I${.CURDIR:H}/msun/${MSUN_ARCH_SUBDIR} +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +CFLAGS+= -I${.CURDIR:H}/msun/x86 +.endif +CFLAGS+= -I${.CURDIR:H}/msun/src +# and we do not want to record a dependency on msun +.if ${.MAKE.LEVEL} > 0 +GENDIRDEPS_FILTER+= N${RELDIR:H}/msun +.endif .endif # Disable warnings in contributed sources.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310130029.r9D0TEDk068067>