[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Fri Mar 2 15:37:29 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/b13678ea9938
changeset: 350:b13678ea9938
user:      ray at terran.dlink.ua
date:      Fri Mar 02 16:51:37 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/usr.bin/clang/Makefile       |  27 ++++++++++++++++++++++++++-
 head/usr.bin/clang/clang/Makefile |  10 +++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r bf19f47d5f54 -r b13678ea9938 head/usr.bin/clang/Makefile

--- a/head/usr.bin/clang/Makefile	Fri Mar 02 16:51:22 2012 +0200
+++ b/head/usr.bin/clang/Makefile	Fri Mar 02 16:51:37 2012 +0200
@@ -1,5 +1,30 @@
-# $FreeBSD: head/usr.bin/clang/Makefile 226633 2011-10-22 14:08:43Z dim $
+# $FreeBSD: head/usr.bin/clang/Makefile 231057 2012-02-05 23:56:22Z dim $
+
+.include <bsd.own.mk>
 
 SUBDIR=	clang clang-tblgen tblgen
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SUBDIR+=bugpoint \
+	llc \
+	lli \
+	llvm-ar \
+	llvm-as \
+	llvm-bcanalyzer \
+	llvm-diff \
+	llvm-dis \
+	llvm-extract \
+	llvm-ld \
+	llvm-link \
+	llvm-mc \
+	llvm-nm \
+	llvm-objdump \
+	llvm-prof \
+	llvm-ranlib \
+	llvm-rtdyld \
+	llvm-stub \
+	macho-dump \
+	opt
+.endif
+
 .include <bsd.subdir.mk>
diff -r bf19f47d5f54 -r b13678ea9938 head/usr.bin/clang/clang/Makefile
--- a/head/usr.bin/clang/clang/Makefile	Fri Mar 02 16:51:22 2012 +0200
+++ b/head/usr.bin/clang/clang/Makefile	Fri Mar 02 16:51:37 2012 +0200
@@ -1,4 +1,4 @@
-# $FreeBSD: head/usr.bin/clang/clang/Makefile 226311 2011-10-12 17:47:15Z dim $
+# $FreeBSD: head/usr.bin/clang/clang/Makefile 232322 2012-02-29 22:58:51Z dim $
 
 .include <bsd.own.mk>
 
@@ -13,6 +13,14 @@
 	${BINDIR}/clang ${BINDIR}/clang-cpp
 MLINKS=	clang.1 clang++.1 \
 	clang.1 clang-cpp.1
+.if ${MK_CLANG_IS_CC} != "no"
+LINKS+=	${BINDIR}/clang ${BINDIR}/cc \
+	${BINDIR}/clang ${BINDIR}/c++ \
+	${BINDIR}/clang ${BINDIR}/cpp
+MLINKS+= clang.1 cc.1 \
+	clang.1 c++.1 \
+	clang.1 cpp.1
+.endif
 
 TGHDRS=	CC1AsOptions \
 	CC1Options \
