svn commit: r239711 - in stable/9: lib/clang usr.bin/clang

Dimitry Andric dim at FreeBSD.org
Sun Aug 26 10:30:02 UTC 2012


Author: dim
Date: Sun Aug 26 10:30:01 2012
New Revision: 239711
URL: http://svn.freebsd.org/changeset/base/239711

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

Modified:
  stable/9/lib/clang/clang.build.mk
  stable/9/lib/clang/clang.lib.mk
  stable/9/usr.bin/clang/clang.prog.mk
Directory Properties:
  stable/9/lib/clang/   (props changed)
  stable/9/usr.bin/clang/   (props changed)

Modified: stable/9/lib/clang/clang.build.mk
==============================================================================
--- stable/9/lib/clang/clang.build.mk	Sun Aug 26 09:54:11 2012	(r239710)
+++ stable/9/lib/clang/clang.build.mk	Sun Aug 26 10:30:01 2012	(r239711)
@@ -1,39 +1,39 @@
 # $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
 
 # Correct for gcc miscompilation when compiling on PPC with -O2
 .if ${MACHINE_CPUARCH} == "powerpc"
-CFLAGS+= -O1 -mminimal-toc
+CFLAGS+=	-O1 -mminimal-toc
 .endif
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 CFLAGS+=-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_ARCH:C/amd64/x86_64/}-unknown-freebsd9.0\"
 
 .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: stable/9/lib/clang/clang.lib.mk
==============================================================================
--- stable/9/lib/clang/clang.lib.mk	Sun Aug 26 09:54:11 2012	(r239710)
+++ stable/9/lib/clang/clang.lib.mk	Sun Aug 26 10:30:01 2012	(r239711)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LLVM_SRCS=${.CURDIR}/../../../contrib/llvm
+LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
 
 .include "clang.build.mk"
 

Modified: stable/9/usr.bin/clang/clang.prog.mk
==============================================================================
--- stable/9/usr.bin/clang/clang.prog.mk	Sun Aug 26 09:54:11 2012	(r239710)
+++ stable/9/usr.bin/clang/clang.prog.mk	Sun Aug 26 10:30:01 2012	(r239711)
@@ -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>


More information about the svn-src-stable-9 mailing list