Date: Tue, 22 Feb 2011 04:07:15 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r218934 - head Message-ID: <201102220407.p1M47FWE093365@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Feb 22 04:07:15 2011 New Revision: 218934 URL: http://svn.freebsd.org/changeset/base/218934 Log: Select building CLANG based on ${TARGET_ARCH} and existence of WITH{,OUT}_CLANG. We default to yes on some archs, no on others, unless WITHOUT_CLANG or WITH_CLANG is defined respectively. Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Feb 22 04:03:33 2011 (r218933) +++ head/Makefile.inc1 Tue Feb 22 04:07:15 2011 (r218934) @@ -42,6 +42,20 @@ TARGET_ARCH=${TARGET} .include <bsd.own.mk> .include <bsd.arch.inc.mk> +# Clang is a special case. We have to use it to bootstrap the target, not +# where we're building from. +.if ${TARGET_ARCH} == i386 || ${TARGET_ARCH} == amd64 || \ + ${TARGET_ARCH} == arm || ${TARGET_ARCH} == powerpc64 || \ + ${TARGET_ARCH} == powerpc +.if !defined(WITHOUT_CLANG) +MK_CLANG=yes +.endif +.else +.if !defined(WITH_CLANG) +MK_CLANG=no +.endif +.endif + # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. @@ -970,11 +984,11 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptre _crunchgen= usr.sbin/crunch/crunchgen .endif -# XXX: There is no way to specify bootstrap tools depending on MK-flags -# with different per-architecture default values. Always build tblgen. +.if ${MK_CLANG} != "no" _clang_tblgen= \ lib/clang/libllvmsupport \ usr.bin/clang/tblgen +.endif .if ${MK_CDDL} != "no" _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102220407.p1M47FWE093365>