aboutsummaryrefslogtreecommitdiff
path: root/lib/libgcc_eh
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2019-12-20 19:53:05 +0000
committerDimitry Andric <dim@FreeBSD.org>2019-12-20 19:53:05 +0000
commit0b57cec536236d46e3dba9bd041533462f33dbb7 (patch)
tree56229dbdbbf76d18580f72f789003db17246c8d9 /lib/libgcc_eh
parent718ef55ec7785aae63f98f8ca05dc07ed399c16d (diff)
downloadsrc-0b57cec536236d46e3dba9bd041533462f33dbb7.tar.gz
src-0b57cec536236d46e3dba9bd041533462f33dbb7.zip
Move all sources from the llvm project into contrib/llvm-project.
This uses the new layout of the upstream repository, which was recently migrated to GitHub, and converted into a "monorepo". That is, most of the earlier separate sub-projects with their own branches and tags were consolidated into one top-level directory, and are now branched and tagged together. Updating the vendor area to match this layout is next.
Notes
Notes: svn path=/head/; revision=355940
Diffstat (limited to 'lib/libgcc_eh')
-rw-r--r--lib/libgcc_eh/Makefile.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc
index a556ff20d882..404c3ac00689 100644
--- a/lib/libgcc_eh/Makefile.inc
+++ b/lib/libgcc_eh/Makefile.inc
@@ -1,8 +1,8 @@
# $FreeBSD$
-COMPILERRTDIR= ${SRCTOP}/contrib/compiler-rt
-UNWINDINCDIR= ${SRCTOP}/contrib/libunwind/include
-UNWINDSRCDIR= ${SRCTOP}/contrib/libunwind/src
+COMPILERRTDIR= ${SRCTOP}/contrib/llvm-project/compiler-rt
+UNWINDINCDIR= ${SRCTOP}/contrib/llvm-project/libunwind/include
+UNWINDSRCDIR= ${SRCTOP}/contrib/llvm-project/libunwind/src
STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN
@@ -35,5 +35,5 @@ STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
# Probably need to just move this earlier or use CXXFLAGS
.if ${MK_DIRDEPS_BUILD} == "yes"
# Avoid dependency on lib/libc++
-CFLAGS+= -isystem ${SRCTOP}/contrib/libc++/include -nostdinc++
+CFLAGS+= -isystem ${SRCTOP}/contrib/llvm-project/libcxx/include -nostdinc++
.endif