Date: Tue, 2 Jun 2009 20:47:10 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r193346 - in projects/clangbsd: . gnu/usr.bin/cc/cc share/mk usr.bin/clang/bin/clang Message-ID: <200906022047.n52KlAa2027859@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Tue Jun 2 20:47:10 2009 New Revision: 193346 URL: http://svn.freebsd.org/changeset/base/193346 Log: Add CLANG_IS_CC, which will install Clang as cc, instead of GCC. This also means it will build everything with Clang. Modified: projects/clangbsd/Makefile.inc1 projects/clangbsd/gnu/usr.bin/cc/cc/Makefile projects/clangbsd/share/mk/bsd.own.mk projects/clangbsd/usr.bin/clang/bin/clang/Makefile Modified: projects/clangbsd/Makefile.inc1 ============================================================================== --- projects/clangbsd/Makefile.inc1 Tue Jun 2 20:44:21 2009 (r193345) +++ projects/clangbsd/Makefile.inc1 Tue Jun 2 20:47:10 2009 (r193346) @@ -1021,8 +1021,13 @@ _kgzip= usr.sbin/kgzip .endif .endif +.if ${MK_CLANG_IS_CC} != "no" +_clang= usr.bin/clang +.endif + cross-tools: .for _tool in \ + ${_clang} \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ usr.bin/sed \ Modified: projects/clangbsd/gnu/usr.bin/cc/cc/Makefile ============================================================================== --- projects/clangbsd/gnu/usr.bin/cc/cc/Makefile Tue Jun 2 20:44:21 2009 (r193345) +++ projects/clangbsd/gnu/usr.bin/cc/cc/Makefile Tue Jun 2 20:47:10 2009 (r193346) @@ -1,15 +1,18 @@ # $FreeBSD$ +.include <bsd.own.mk> + .include "../Makefile.inc" .include "../Makefile.fe" -PROG= cc -MAN= gcc.1 +PROG= gcc SRCS+= gccspec.c NO_SHARED?=yes -LINKS= ${BINDIR}/cc ${BINDIR}/gcc +.if ${MK_CLANG_IS_CC} == "no" +LINKS= ${BINDIR}/gcc ${BINDIR}/cc +.endif MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1 .include <bsd.prog.mk> Modified: projects/clangbsd/share/mk/bsd.own.mk ============================================================================== --- projects/clangbsd/share/mk/bsd.own.mk Tue Jun 2 20:44:21 2009 (r193345) +++ projects/clangbsd/share/mk/bsd.own.mk Tue Jun 2 20:47:10 2009 (r193346) @@ -408,6 +408,7 @@ MK_${var}:= yes BIND_SIGCHASE \ BIND_XML \ CLANG \ + CLANG_IS_CC \ GNU_CPIO \ HESIOD \ IDEA Modified: projects/clangbsd/usr.bin/clang/bin/clang/Makefile ============================================================================== --- projects/clangbsd/usr.bin/clang/bin/clang/Makefile Tue Jun 2 20:44:21 2009 (r193345) +++ projects/clangbsd/usr.bin/clang/bin/clang/Makefile Tue Jun 2 20:47:10 2009 (r193346) @@ -8,6 +8,10 @@ SRCDIR= tools/clang/tools/driver SRCS= driver.cpp MAN= +.if ${MK_CLANG_IS_CC} != "no" +LINKS= ${BINDIR}/clang ${BINDIR}/cc +.endif + TGHDRS= DiagnosticCommonKinds LIBDEPS=clangdriver clangfrontend clanglex clangbasic \ llvmbitreader llvmbitwriter llvmsupport llvmsystem
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906022047.n52KlAa2027859>