Date: Sat, 27 Aug 2016 09:29:39 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r304884 - in projects/clang390-import: lib/clang lib/clang/libclang lib/clang/liblldb usr.bin/clang usr.bin/clang/lldb Message-ID: <201608270929.u7R9Tdqt071187@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Aug 27 09:29:39 2016 New Revision: 304884 URL: https://svnweb.freebsd.org/changeset/base/304884 Log: Use SRCTOP and OBJTOP throughout the llvm/clang/lldb build. Modified: projects/clang390-import/lib/clang/libclang/Makefile projects/clang390-import/lib/clang/liblldb/Makefile projects/clang390-import/lib/clang/llvm.build.mk projects/clang390-import/lib/clang/llvm.pre.mk projects/clang390-import/usr.bin/clang/clang.prog.mk projects/clang390-import/usr.bin/clang/lldb/Makefile projects/clang390-import/usr.bin/clang/llvm.prog.mk Modified: projects/clang390-import/lib/clang/libclang/Makefile ============================================================================== --- projects/clang390-import/lib/clang/libclang/Makefile Sat Aug 27 09:23:20 2016 (r304883) +++ projects/clang390-import/lib/clang/libclang/Makefile Sat Aug 27 09:29:39 2016 (r304884) @@ -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 Modified: projects/clang390-import/lib/clang/liblldb/Makefile ============================================================================== --- projects/clang390-import/lib/clang/liblldb/Makefile Sat Aug 27 09:23:20 2016 (r304883) +++ projects/clang390-import/lib/clang/liblldb/Makefile Sat Aug 27 09:29:39 2016 (r304884) @@ -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 Modified: projects/clang390-import/lib/clang/llvm.build.mk ============================================================================== --- projects/clang390-import/lib/clang/llvm.build.mk Sat Aug 27 09:23:20 2016 (r304883) +++ projects/clang390-import/lib/clang/llvm.build.mk Sat Aug 27 09:29:39 2016 (r304884) @@ -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 Modified: projects/clang390-import/lib/clang/llvm.pre.mk ============================================================================== --- projects/clang390-import/lib/clang/llvm.pre.mk Sat Aug 27 09:23:20 2016 (r304883) +++ projects/clang390-import/lib/clang/llvm.pre.mk Sat Aug 27 09:29:39 2016 (r304884) @@ -1,5 +1,5 @@ # $FreeBSD$ -LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm +LLVM_SRCS= ${SRCTOP}/contrib/llvm LLVM_TBLGEN?= llvm-tblgen Modified: projects/clang390-import/usr.bin/clang/clang.prog.mk ============================================================================== --- projects/clang390-import/usr.bin/clang/clang.prog.mk Sat Aug 27 09:23:20 2016 (r304883) +++ projects/clang390-import/usr.bin/clang/clang.prog.mk Sat Aug 27 09:29:39 2016 (r304884) @@ -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 Modified: projects/clang390-import/usr.bin/clang/lldb/Makefile ============================================================================== --- projects/clang390-import/usr.bin/clang/lldb/Makefile Sat Aug 27 09:23:20 2016 (r304883) +++ projects/clang390-import/usr.bin/clang/lldb/Makefile Sat Aug 27 09:29:39 2016 (r304884) @@ -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 Modified: projects/clang390-import/usr.bin/clang/llvm.prog.mk ============================================================================== --- projects/clang390-import/usr.bin/clang/llvm.prog.mk Sat Aug 27 09:23:20 2016 (r304883) +++ projects/clang390-import/usr.bin/clang/llvm.prog.mk Sat Aug 27 09:29:39 2016 (r304884) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608270929.u7R9Tdqt071187>