diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2014-03-15 06:45:41 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2014-03-15 06:45:41 +0000 |
commit | 858799c60ce54271cbdb94b9e2ff6bb3e3f91b1c (patch) | |
tree | 0155fa7a4eb4fcb794100a5ff276568222709bb3 /lang/clang-devel/files | |
parent | ffc143d74a18eb04266a0823dd2e2f057ca60259 (diff) | |
download | ports-858799c60ce54271cbdb94b9e2ff6bb3e3f91b1c.tar.gz ports-858799c60ce54271cbdb94b9e2ff6bb3e3f91b1c.zip |
Notes
Diffstat (limited to 'lang/clang-devel/files')
3 files changed, 7 insertions, 71 deletions
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.cpp deleted file mode 100644 index d34e4d8781a4..000000000000 --- a/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.cpp +++ /dev/null @@ -1,44 +0,0 @@ - -$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/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.h b/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.h deleted file mode 100644 index 1c35a3f5f16d..000000000000 --- a/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.h +++ /dev/null @@ -1,20 +0,0 @@ - -$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 llvm::opt::ArgList &Args); - -+ virtual CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const; -+ - virtual bool IsMathErrnoDefault() const { return false; } - virtual bool IsObjCNonFragileABIDefault() const { return true; } - -+ virtual void AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const; -+ - virtual bool UseSjLjExceptions() const; - protected: - virtual Tool *buildAssembler() const; diff --git a/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build b/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build index f5bd884e8b2c..9872d6bf78b1 100644 --- a/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build +++ b/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build @@ -1,23 +1,23 @@ -$FreeBSD: /tmp/pcvs/ports/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build,v 1.1 2010-10-08 14:00:31 brooks Exp $ +$FreeBSD$ --- tools/clang/tools/scan-build/scan-build.orig +++ tools/clang/tools/scan-build/scan-build -@@ -423,7 +423,7 @@ +@@ -419,7 +419,7 @@ my $Dir = shift; - my $JS = Cwd::realpath("$RealBin/sorttable.js"); + my $JS = Cwd::realpath("%%DATADIR%%/sorttable.js"); - + DieDiag("Cannot find 'sorttable.js'.\n") - if (! -r $JS); -@@ -433,7 +433,7 @@ + if (! -r $JS); +@@ -429,7 +429,7 @@ DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") if (! -r "$Dir/sorttable.js"); - + - my $CSS = Cwd::realpath("$RealBin/scanview.css"); + my $CSS = Cwd::realpath("%%DATADIR%%/scanview.css"); - + DieDiag("Cannot find 'scanview.css'.\n") if (! -r $CSS); |