diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2013-07-10 11:27:36 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2013-07-10 11:27:36 +0000 |
| commit | 831af9a6e70323fd3b5f6caf1f4872774a8d0048 (patch) | |
| tree | 4868cff9e16e34a8f49d1a42e566019b6a2936fd /lang/clang33 | |
| parent | Mark jobs unsafe (diff) | |
Teach clang33 where to find libc++ headers when installed from ports.
It will use the headers in base if it finds them there.
Approved by: maintainer (brooks@)
Notes
Notes:
svn path=/head/; revision=322654
Diffstat (limited to 'lang/clang33')
| -rw-r--r-- | lang/clang33/Makefile | 3 | ||||
| -rw-r--r-- | lang/clang33/files/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp | 15 |
2 files changed, 18 insertions, 0 deletions
diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile index b99ff6485278..0dfff7e88819 100644 --- a/lang/clang33/Makefile +++ b/lang/clang33/Makefile @@ -2,6 +2,7 @@ PORTNAME= clang DISTVERSION= 3.3 +PORTREVISION= 1 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${CLANG_NAME} @@ -93,6 +94,8 @@ post-patch: ${WRKSRC}/Makefile.config.in ${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \ ${WRKSRC}/Makefile.config.in + ${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \ + ${WRKSRC}/tools/clang/lib/Frontend/InitHeaderSearch.cpp pre-build: ${LN} -sf ${LLVM_PREFIX}/include/llvm/IR/Intrinsics.gen \ diff --git a/lang/clang33/files/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp b/lang/clang33/files/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp new file mode 100644 index 000000000000..283a4aa5be75 --- /dev/null +++ b/lang/clang33/files/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp @@ -0,0 +1,15 @@ +Look for the libc++ headers in base, and afterwards look if they might +have been installed in ports. This is only usefull on FreeBSD <= 9.x since +libc++ is shipped in 10 by default. No path to the library of libc++ is +provided. The port wanting to use libc++ need to provide its own LDFLAGS. + +--- tools/clang/lib/Frontend/InitHeaderSearch.cpp.orig 2013-06-21 20:35:23.000000000 +0200 ++++ tools/clang/lib/Frontend/InitHeaderSearch.cpp 2013-06-21 20:41:38.000000000 +0200 +@@ -486,6 +486,7 @@ void InitHeaderSearch::AddDefaultInclude + AddPath("/usr/include/c++/v1/support/solaris", CXXSystem, false); + + AddPath("/usr/include/c++/v1", CXXSystem, false); ++ AddPath("/usr/local/include/c++/v1", CXXSystem, false); + } else { + AddDefaultCPlusPlusIncludePaths(triple, HSOpts); + } |