From e1cd7682995cc00d1a07008db735562230569922 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 27 Aug 2016 09:29:39 +0000
Subject: [PATCH] Use SRCTOP and OBJTOP throughout the llvm/clang/lldb build.

---
 lib/clang/libclang/Makefile |  2 +-
 lib/clang/liblldb/Makefile  |  6 +++---
 lib/clang/llvm.build.mk     |  2 +-
 lib/clang/llvm.pre.mk       |  2 +-
 usr.bin/clang/clang.prog.mk |  4 ++--
 usr.bin/clang/lldb/Makefile |  8 ++++----
 usr.bin/clang/llvm.prog.mk  | 10 +++++-----
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
index 5db2063e5c6..b2d0ffcd94b 100644
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@@ -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
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index 6fda218a033..4a8eaf26599 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/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
 
@@ -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
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
index f3e7f93547d..62a21d84468 100644
--- a/lib/clang/llvm.build.mk
+++ b/lib/clang/llvm.build.mk
@@ -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
diff --git a/lib/clang/llvm.pre.mk b/lib/clang/llvm.pre.mk
index 5fd5b121e22..9245b9824a1 100644
--- a/lib/clang/llvm.pre.mk
+++ b/lib/clang/llvm.pre.mk
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-LLVM_SRCS=	${.CURDIR}/../../../contrib/llvm
+LLVM_SRCS=	${SRCTOP}/contrib/llvm
 
 LLVM_TBLGEN?=	llvm-tblgen
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index 231c5cdd897..7d254252c01 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 1c3603ddf09..110e404aeef 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 b85e8013b40..89165ab11f9 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