From owner-svn-src-projects@FreeBSD.ORG Wed May 19 17:18:38 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BCB0B1065678; Wed, 19 May 2010 17:18:38 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A896D8FC08; Wed, 19 May 2010 17:18:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4JHIcpS037160; Wed, 19 May 2010 17:18:38 GMT (envelope-from rdivacky@svn.freebsd.org) Received: (from rdivacky@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4JHIcne037155; Wed, 19 May 2010 17:18:38 GMT (envelope-from rdivacky@svn.freebsd.org) Message-Id: <201005191718.o4JHIcne037155@svn.freebsd.org> From: Roman Divacky Date: Wed, 19 May 2010 17:18:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208304 - in projects/clangbsd: lib lib/clang usr.bin/clang usr.bin/clang/bin/clang usr.bin/clang/bin/tblgen usr.bin/clang/clang usr.bin/clang/include usr.bin/clang/lib usr.bin/clang/tb... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 19 May 2010 17:18:38 -0000 Author: rdivacky Date: Wed May 19 17:18:38 2010 New Revision: 208304 URL: http://svn.freebsd.org/changeset/base/208304 Log: merge r208280, the big renaming of clang makefiles Added: projects/clangbsd/lib/clang/ - copied from r208280, projects/clangbsd-import/lib/clang/ projects/clangbsd/usr.bin/clang/clang/ - copied from r208280, projects/clangbsd-import/usr.bin/clang/clang/ projects/clangbsd/usr.bin/clang/tblgen/ - copied from r208280, projects/clangbsd-import/usr.bin/clang/tblgen/ Deleted: projects/clangbsd/usr.bin/clang/bin/clang/ projects/clangbsd/usr.bin/clang/bin/tblgen/ projects/clangbsd/usr.bin/clang/clang.lib.mk projects/clangbsd/usr.bin/clang/include/ projects/clangbsd/usr.bin/clang/lib/ Modified: projects/clangbsd/lib/Makefile projects/clangbsd/usr.bin/clang/Makefile projects/clangbsd/usr.bin/clang/clang.build.mk projects/clangbsd/usr.bin/clang/clang.prog.mk Directory Properties: projects/clangbsd/lib/libc/ (props changed) projects/clangbsd/lib/libc/stdtime/ (props changed) projects/clangbsd/lib/libutil/ (props changed) projects/clangbsd/lib/libz/ (props changed) projects/clangbsd/usr.bin/csup/ (props changed) projects/clangbsd/usr.bin/procstat/ (props changed) Modified: projects/clangbsd/lib/Makefile ============================================================================== --- projects/clangbsd/lib/Makefile Wed May 19 17:12:02 2010 (r208303) +++ projects/clangbsd/lib/Makefile Wed May 19 17:18:38 2010 (r208304) @@ -106,7 +106,8 @@ SUBDIR= ${SUBDIR_ORDERED} \ libwrap \ liby \ libz \ - ${_bind} + ${_bind} \ + ${_clang} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -135,6 +136,10 @@ _libsdp= libsdp _libbsnmp= libbsnmp .endif +.if ${MK_CLANG} != "no" +_clang= clang +.endif + .if ${MK_GPIB} != "no" _libgpib= libgpib .endif Modified: projects/clangbsd/usr.bin/clang/Makefile ============================================================================== --- projects/clangbsd/usr.bin/clang/Makefile Wed May 19 17:12:02 2010 (r208303) +++ projects/clangbsd/usr.bin/clang/Makefile Wed May 19 17:18:38 2010 (r208304) @@ -1,7 +1,5 @@ # $FreeBSD$ -SUBDIR= lib \ - bin \ - include +SUBDIR= clang .include Modified: projects/clangbsd/usr.bin/clang/clang.build.mk ============================================================================== --- projects/clangbsd/usr.bin/clang/clang.build.mk Wed May 19 17:12:02 2010 (r208303) +++ projects/clangbsd/usr.bin/clang/clang.build.mk Wed May 19 17:18:38 2010 (r208304) @@ -1,11 +1,10 @@ # $FreeBSD$ -LLVM_SRCS=${.CURDIR}/../../../../contrib/llvm CLANG_SRCS=${LLVM_SRCS}/tools/clang CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \ -I${LLVM_SRCS}/${SRCDIR} ${INCDIR:C/^/-I${LLVM_SRCS}\//} -I. \ - -I${.CURDIR}/../../include \ + -I${LLVM_SRCS}/../../lib/clang/include \ -DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG Modified: projects/clangbsd/usr.bin/clang/clang.prog.mk ============================================================================== --- projects/clangbsd/usr.bin/clang/clang.prog.mk Wed May 19 17:12:02 2010 (r208303) +++ projects/clangbsd/usr.bin/clang/clang.prog.mk Wed May 19 17:18:38 2010 (r208304) @@ -1,10 +1,12 @@ # $FreeBSD$ -.include "clang.build.mk" +LLVM_SRCS=${.CURDIR}/../../../contrib/llvm + +.include "../../lib/clang/clang.build.mk" .for lib in ${LIBDEPS} -DPADD+= ${.OBJDIR}/../../lib/lib${lib}/lib${lib}.a -LDADD+= ${.OBJDIR}/../../lib/lib${lib}/lib${lib}.a +DPADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a +LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a .endfor BINDIR?=/usr/bin