From owner-svn-src-projects@FreeBSD.ORG Sun Oct 13 00:29:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E947C993; Sun, 13 Oct 2013 00:29:14 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D63632849; Sun, 13 Oct 2013 00:29:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D0TE9W068068; Sun, 13 Oct 2013 00:29:14 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D0TEDk068067; Sun, 13 Oct 2013 00:29:14 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201310130029.r9D0TEDk068067@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sun, 13 Oct 2013 00:29:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256422 - projects/bmake/lib/libc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 00:29:15 -0000 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.