From owner-svn-src-projects@FreeBSD.ORG Fri May 16 15:00:04 2014 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 ESMTPS id E7903ED3; Fri, 16 May 2014 15:00:04 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BBD5F284D; Fri, 16 May 2014 15:00:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GF04G2084044; Fri, 16 May 2014 15:00:04 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GF0413084042; Fri, 16 May 2014 15:00:04 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201405161500.s4GF0413084042@svn.freebsd.org> From: "Simon J. Gerraty" Date: Fri, 16 May 2014 15:00:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r266234 - projects/bmake/share/mk 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.18 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: Fri, 16 May 2014 15:00:05 -0000 Author: sjg Date: Fri May 16 15:00:04 2014 New Revision: 266234 URL: http://svnweb.freebsd.org/changeset/base/266234 Log: There are a few libs we need to build for host. Handle more optional dependencies. Modified: projects/bmake/share/mk/local.dirdeps.mk Modified: projects/bmake/share/mk/local.dirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.dirdeps.mk Fri May 16 14:58:48 2014 (r266233) +++ projects/bmake/share/mk/local.dirdeps.mk Fri May 16 15:00:04 2014 (r266234) @@ -25,7 +25,11 @@ M_dep_qual_fixes += C;($m),[^/.,]*$$;\1; #.info M_dep_qual_fixes=${M_dep_qual_fixes} # we want to supress these dependencies for host tools # but some libs are sadly needed. -_need_host_libs= lib/libdwarf +_need_host_libs= \ + lib/libc++ \ + lib/libcxxrt \ + lib/libdwarf \ + N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}} DIRDEPS_FILTER.host = \ ${N_host_libs} \ @@ -36,17 +40,30 @@ DIRDEPS_FILTER.host = \ Ngnu/lib/lib[a-r]* \ +DIRDEPS_FILTER+= \ + ${DIRDEPS_FILTER.xtras:U} +.endif + +# reset this each time +DIRDEPS_FILTER.xtras= +.if ${DEP_MACHINE:Npkgs*} != "" +DIRDEPS_FILTER.xtras+= Nusr.bin/clang/clang.host .endif .if ${DEP_MACHINE} != "host" # this is how we can handle optional dependencies -.if ${MK_SSP:Uno} != "no" && ${DEP_RELDIR:U${RELDIR}} == "lib/libc" +.if ${DEP_RELDIR} == "lib/libc" +DIRDEPS += lib/libc_nonshared +.if ${MK_SSP:Uno} != "no" DIRDEPS += gnu/lib/libssp/libssp_nonshared .endif +.else +DIRDEPS_FILTER.xtras+= Nlib/libc_nonshared +.endif # some optional things -.if ${MK_CTF} == "yes" && ${DEP_RELDIR:U${RELDIR}:Mcddl/usr.bin/ctf*} == "" +.if ${MK_CTF} == "yes" && ${DEP_RELDIR:Mcddl/usr.bin/ctf*} == "" DIRDEPS += \ cddl/usr.bin/ctfconvert.host \ cddl/usr.bin/ctfmerge.host @@ -54,8 +71,12 @@ DIRDEPS += \ .endif +.if ${MK_CLANG} == "yes" && ${DEP_RELDIR:Nlib/clang/lib*:Nlib/libc*} == "" +DIRDEPS+= lib/clang/include +.endif + # we need pkgs/pseudo/stage to prep the stage tree -.if ${DEP_RELDIR:U${RELDIR}} != "pkgs/pseudo/stage" +.if ${DEP_RELDIR} != "pkgs/pseudo/stage" DIRDEPS += pkgs/pseudo/stage .endif