svn commit: r239614 - in head: lib/clang usr.bin/clang

[Dimitry Andric]

Author: dim
Date: Thu Aug 23 17:08:07 2012
New Revision: 239614
URL: http://svn.freebsd.org/changeset/base/239614

Log:
  Sprinkle a bit of style.Makefile(5) across various clang Makefiles.  No
  functional changes.
  
  MFC after:	3 days

Modified:
  head/lib/clang/clang.build.mk
  head/lib/clang/clang.lib.mk
  head/usr.bin/clang/clang.prog.mk

Modified: head/lib/clang/clang.build.mk
==============================================================================
--- head/lib/clang/clang.build.mk	Thu Aug 23 17:03:33 2012	(r239613)
+++ head/lib/clang/clang.build.mk	Thu Aug 23 17:08:07 2012	(r239614)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
-CLANG_SRCS=${LLVM_SRCS}/tools/clang
+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${LLVM_SRCS}/../../lib/clang/include \
-	-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \
-	-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG
+CFLAGS+=	-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \
+		-I${LLVM_SRCS}/${SRCDIR} ${INCDIR:C/^/-I${LLVM_SRCS}\//} -I. \
+		-I${LLVM_SRCS}/../../lib/clang/include \
+		-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \
+		-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG
 
 # LLVM is not strict aliasing safe as of 12/31/2011
-CFLAGS+= -fno-strict-aliasing
+CFLAGS+=	-fno-strict-aliasing
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 BUILD_ARCH?=	${MACHINE_ARCH}
@@ -19,23 +19,23 @@ CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"
 		-DLLVM_HOSTTRIPLE=\"${BUILD_TRIPLE}\"
 
 .ifndef LLVM_REQUIRES_EH
-CXXFLAGS+=-fno-exceptions
+CXXFLAGS+=	-fno-exceptions
 .else
 # If the library or program requires EH, it also requires RTTI.
 LLVM_REQUIRES_RTTI=
 .endif
 
 .ifndef LLVM_REQUIRES_RTTI
-CXXFLAGS+=-fno-rtti
+CXXFLAGS+=	-fno-rtti
 .endif
 
-CFLAGS+=-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
+CFLAGS+=	-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
 
 .PATH:	${LLVM_SRCS}/${SRCDIR}
 
-TBLGEN?=tblgen
-CLANG_TBLGEN?=clang-tblgen
-TBLINC+=-I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target
+TBLGEN?=	tblgen
+CLANG_TBLGEN?=	clang-tblgen
+TBLINC+=	-I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target
 
 Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/Intrinsics.td
 	${TBLGEN} -I ${LLVM_SRCS}/lib/VMCore ${TBLINC} -gen-intrinsic \

Modified: head/lib/clang/clang.lib.mk
==============================================================================
--- head/lib/clang/clang.lib.mk	Thu Aug 23 17:03:33 2012	(r239613)
+++ head/lib/clang/clang.lib.mk	Thu Aug 23 17:08:07 2012	(r239614)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=${.CURDIR}/../../../contrib/llvm
+LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
 
 .include "clang.build.mk"
 

Modified: head/usr.bin/clang/clang.prog.mk
==============================================================================
--- head/usr.bin/clang/clang.prog.mk	Thu Aug 23 17:03:33 2012	(r239613)
+++ head/usr.bin/clang/clang.prog.mk	Thu Aug 23 17:08:07 2012	(r239614)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-LLVM_SRCS=${.CURDIR}/../../../contrib/llvm
+LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
 
 .include "../../lib/clang/clang.build.mk"
 
 .for lib in ${LIBDEPS}
-DPADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
-LDADD+= ${.OBJDIR}/../../../lib/clang/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
+BINDIR?= /usr/bin
 
 .include <bsd.prog.mk>