talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use SRCTOP and OBJTOP throughout the llvm/clang/lldb build.

This commit is contained in:
Dimitry Andric 2016-08-27 09:29:39 +00:00
parent 4cbc970cde
commit e1cd768299
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/clang/libclang/Makefile
View File

@ -6,7 +6,7 @@
LIB= clang
CFLAGS+= -I${.OBJDIR}
CFLAGS+= -I${.OBJDIR}/../../../lib/clang/libllvm
CFLAGS+= -I${OBJTOP}/lib/clang/libllvm
# Ensure FREEBSD_CC_VERSION is defined for Basic/Targets.cpp
CFLAGS.Targets.cpp+= -include ../freebsd_cc_version.h

6
lib/clang/liblldb/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
LLVM_SRCS= ${SRCTOP}/contrib/llvm
CLANG_SRCS= ${LLVM_SRCS}/tools/clang
LLDB_SRCS= ${LLVM_SRCS}/tools/lldb
@ -12,8 +12,8 @@ CFLAGS+= -I${LLDB_SRCS}/source
CFLAGS+= -I${LLDB_SRCS}/source/Plugins/Process/FreeBSD
CFLAGS+= -I${LLDB_SRCS}/source/Plugins/Process/POSIX
CFLAGS+= -I${LLDB_SRCS}/source/Plugins/Process/Utility
CFLAGS+= -I${.OBJDIR}/../../../lib/clang/libllvm
CFLAGS+= -I${.OBJDIR}/../../../lib/clang/libclang
CFLAGS+= -I${OBJTOP}/lib/clang/libllvm
CFLAGS+= -I${OBJTOP}/lib/clang/libclang
CFLAGS+= -DLLDB_DISABLE_PYTHON
SRCS+= API/SBAddress.cpp

2
lib/clang/llvm.build.mk
View File

@ -10,7 +10,7 @@
.PATH: ${LLVM_SRCS}/${SRCDIR}
CFLAGS+= -I${.CURDIR}/../../../lib/clang/include
CFLAGS+= -I${SRCTOP}/lib/clang/include
CFLAGS+= -I${LLVM_SRCS}/include
CFLAGS+= -DLLVM_ON_UNIX
CFLAGS+= -DLLVM_ON_FREEBSD

2
lib/clang/llvm.pre.mk
View File

@ -1,5 +1,5 @@
# $FreeBSD$
LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
LLVM_SRCS= ${SRCTOP}/contrib/llvm
LLVM_TBLGEN?= llvm-tblgen

4
usr.bin/clang/clang.prog.mk
View File

@ -1,12 +1,12 @@
# $FreeBSD$
LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
LLVM_SRCS= ${SRCTOP}/contrib/llvm
CLANG_SRCS= ${LLVM_SRCS}/tools/clang
CFLAGS+= -I${.OBJDIR}/../../../lib/clang/libclang
CFLAGS+= -I${.OBJDIR}/../../../lib/clang/libllvm
.include "${.CURDIR}/../../../lib/clang/clang.build.mk"
.include "${SRCTOP}/lib/clang/clang.build.mk"
LIBDEPS+= clang
LIBDEPS+= llvm

8
usr.bin/clang/lldb/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
LLVM_SRCS= ${SRCTOP}/contrib/llvm
CLANG_SRCS= ${LLVM_SRCS}/tools/clang
LLDB_SRCS= ${LLVM_SRCS}/tools/lldb
@ -14,15 +14,15 @@ SRCDIR= tools/lldb/tools/driver
SRCS+= Driver.cpp
SRCS+= Platform.cpp
.include "${.CURDIR}/../../../lib/clang/clang.build.mk"
.include "${SRCTOP}/lib/clang/clang.build.mk"
LIBDEPS+= lldb
LIBDEPS+= clang
LIBDEPS+= llvm
.for lib in ${LIBDEPS}
DPADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
.endfor
LIBADD+= edit

10
usr.bin/clang/llvm.prog.mk
View File

@ -1,10 +1,10 @@
# $FreeBSD$
LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
LLVM_SRCS= ${SRCTOP}/contrib/llvm
CFLAGS+= -I${.OBJDIR}/../../../lib/clang/libllvm
CFLAGS+= -I${OBJTOP}/lib/clang/libllvm
.include "${.CURDIR}/../../../lib/clang/llvm.build.mk"
.include "${SRCTOP}/lib/clang/llvm.build.mk"
# Special case for the bootstrap-tools phase.
.if defined(TOOLS_PREFIX) && \
@ -15,8 +15,8 @@ LIBDEPS+= llvm
.endif
.for lib in ${LIBDEPS}
DPADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a
.endfor
LIBADD+= ncursesw