diff options
Diffstat (limited to 'usr.bin/clang')
| -rw-r--r-- | usr.bin/clang/clang.prog.mk | 4 | ||||
| -rw-r--r-- | usr.bin/clang/lldb/Makefile | 8 | ||||
| -rw-r--r-- | usr.bin/clang/llvm.prog.mk | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 231c5cdd897a..7d254252c016 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -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 diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 1c3603ddf098..110e404aeefb 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -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 diff --git a/usr.bin/clang/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk index b85e8013b409..89165ab11f9e 100644 --- a/usr.bin/clang/llvm.prog.mk +++ b/usr.bin/clang/llvm.prog.mk @@ -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 |