From 272e5f29ac311ec138652e680a3b1400bad0a1fa Mon Sep 17 00:00:00 2001
Date: Mon, 17 May 2021 21:12:59 -0700
Subject: [PATCH 15/24] Fixup libstdc++ header search paths for older versions
 of Mac OS X

---
 clang/lib/Driver/ToolChains/Darwin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index da1d171ce859..cef270cfc34a 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -2112,7 +2112,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
                                                  "powerpc-apple-darwin10",
                                                  arch == llvm::Triple::ppc64 ? "ppc64" : "");
       IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
-                                                "4.0.0", "powerpc-apple-darwin10",
+                                                "4.0.0", "powerpc-apple-darwin8",
                                                  arch == llvm::Triple::ppc64 ? "ppc64" : "");
       break;
 
@@ -2131,7 +2131,7 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
                                                  arch == llvm::Triple::x86_64 ? "x86_64" : "");
       IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
                                                 "4.0.0", "i686-apple-darwin8",
-                                                 "");
+                                                 arch == llvm::Triple::x86_64 ? "x86_64" : "");
       break;
 
     case llvm::Triple::arm:
-- 
2.21.1 (Apple Git-122.3)