3 files changed, 65 insertions, 1 deletions

diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile
index ac8fbd8a5c72..10c9080ff344 100644
--- a/lang/clang33/Makefile
+++ b/lang/clang33/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	clang
 DISTVERSION=	3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
diff --git a/lang/clang33/files/patch-tools_clang_lib_Driver_ToolChains.cpp b/lang/clang33/files/patch-tools_clang_lib_Driver_ToolChains.cpp
new file mode 100644
index 000000000000..d34e4d8781a4
--- /dev/null
+++ b/lang/clang33/files/patch-tools_clang_lib_Driver_ToolChains.cpp
@@ -0,0 +1,44 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Driver/ToolChains.cpp.orig
++++ tools/clang/lib/Driver/ToolChains.cpp
+@@ -1950,6 +1950,38 @@
+   }
+ }
+ 
++ToolChain::CXXStdlibType
++FreeBSD::GetCXXStdlibType(const ArgList &Args) const {
++  if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) {
++    StringRef Value = A->getValue();
++    if (Value == "libc++")
++      return ToolChain::CST_Libcxx;
++    if (Value == "libstdc++")
++      return ToolChain::CST_Libstdcxx;
++    getDriver().Diag(diag::err_drv_invalid_stdlib_name)
++      << A->getAsString(Args);
++  }
++
++  return getTriple().getOSMajorVersion() >= 10 ? ToolChain::CST_Libcxx :
++         ToolChain::CST_Libstdcxx;
++}
++
++void FreeBSD::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
++                                          ArgStringList &CC1Args) const {
++  if (DriverArgs.hasArg(options::OPT_nostdlibinc) ||
++      DriverArgs.hasArg(options::OPT_nostdincxx))
++    return;
++
++  if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx)
++    addSystemInclude(DriverArgs, CC1Args,
++                     getDriver().SysRoot + "/usr/include/c++/v1");
++  else
++    addSystemInclude(DriverArgs, CC1Args,
++                     getDriver().SysRoot + "/usr/include/c++/4.2");
++  return;
++
++}
++
+ /// NetBSD - NetBSD tool chain which can call as(1) and ld(1) directly.
+ 
+ NetBSD::NetBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)
diff --git a/lang/clang33/files/patch-tools_clang_lib_Driver_ToolChains.h b/lang/clang33/files/patch-tools_clang_lib_Driver_ToolChains.h
new file mode 100644
index 000000000000..f30e6840361e
--- /dev/null
+++ b/lang/clang33/files/patch-tools_clang_lib_Driver_ToolChains.h
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Driver/ToolChains.h.orig
++++ tools/clang/lib/Driver/ToolChains.h
+@@ -515,9 +515,14 @@
+   FreeBSD(const Driver &D, const llvm::Triple &Triple,
+           const ArgList &Args);
+ 
++  virtual CXXStdlibType GetCXXStdlibType(const ArgList &Args) const;
++
+   virtual bool IsMathErrnoDefault() const { return false; }
+   virtual bool IsObjCNonFragileABIDefault() const { return true; }
+ 
++  virtual void AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
++                                            ArgStringList &CC1Args) const;
++
+   virtual bool UseSjLjExceptions() const;
+ protected:
+   virtual Tool *buildAssembler() const;