From a48d51f49e3186bebb143921580c1277ffe54114 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Mon, 31 Oct 2016 15:06:36 -0700 Subject: [PATCH] Fixup libstdc++ header search paths for older versions of Mac OS X The subpaths were removed in Lion. Leopard and Snow Leopard had darwin8 symlinks for compatibility. https://llvm.org/bugs/show_bug.cgi?id=30858 Signed-off-by: Jeremy Huddleston Sequoia --- 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 445fd4ec0096..d9dde5adc24c 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -2055,7 +2055,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; @@ -2067,7 +2067,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.37.2