sys-devel/clang: gcc-config patch went upstream

2 files changed, 0 insertions, 54 deletions

diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index a4bbcfa8360b..6a09eb1c944d 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -115,8 +115,6 @@ src_unpack() {
 src_prepare() {
 	python_setup
 
-	# automatically select active system GCC's libraries, bugs #406163 and #417913
-	eapply "${FILESDIR}"/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch
 	# support overriding clang runtime install directory
 	eapply "${FILESDIR}"/9999/0005-cmake-Supporting-overriding-runtime-libdir-via-CLANG.patch
 	# support overriding LLVMgold.so plugin directory
diff --git a/sys-devel/clang/files/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch b/sys-devel/clang/files/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch
deleted file mode 100644
index 00bf28016eba..000000000000
--- a/sys-devel/clang/files/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0384060d2de35ee56aa252cc18eccf773d674d56 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 5 Sep 2014 16:49:35 +0200
-Subject: [PATCH] driver: Support obtaining active toolchain from gcc-config on
- Gentoo
-
-Author: Richard Yao <ryao@gentoo.org>
-Bug: https://bugs.gentoo.org/406163
-Bug: https://bugs.gentoo.org/417913
----
- lib/Driver/ToolChains.cpp | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
-index 67f165c..0f0d786 100644
---- a/lib/Driver/ToolChains.cpp
-+++ b/lib/Driver/ToolChains.cpp
-@@ -1430,6 +1430,31 @@ void Generic_GCC::GCCInstallationDetector::init(
-     }
-   }
- 
-+  // Try to respect gcc-config on Gentoo. However, do that only
-+  // if --gcc-toolchain is not provided or equal to the Gentoo default.
-+  // This avoids accidentally enforcing system GCC version when using
-+  // a custom toolchain.
-+  if (GCCToolchainDir == "" || GCCToolchainDir == D.SysRoot + "/usr") {
-+    for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) {
-+      llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
-+          llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str());
-+      if (File)
-+      {
-+        const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str();
-+        const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText;
-+        if (llvm::sys::fs::exists(GentooPath + "/crtbegin.o"))
-+        {
-+          Version = GCCVersion::Parse(VersionText);
-+          GCCInstallPath = GentooPath;
-+          GCCParentLibPath = GCCInstallPath + "/../../..";
-+          GCCTriple.setTriple(CandidateTripleAliases[k]);
-+          IsValid = true;
-+          return;
-+        }
-+      }
-+    }
-+  }
-+
-   // Loop over the various components which exist and select the best GCC
-   // installation available. GCC installs are ranked by version number.
-   Version = GCCVersion::Parse("0.0.0");
--- 
-2.10.0
-