From 013ee27a17e32ddf078bf33a82293a9f9980512e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 19 May 2021 17:56:03 -0700 Subject: [PATCH] clang: Fix x86 triple for non-debian multiarch linux distros OpenEmbedded does not hardcode mutli-arch like debian therefore ensure that it still uses the proper tuple Upstream-Status: Pending Signed-off-by: Khem Raj --- clang/lib/Driver/ToolChains/Linux.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index ca9f5f2e4f74..20c7c7a745be 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -667,6 +667,9 @@ void Linux::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, GCCInstallation.getTriple().getArch() == llvm::Triple::x86 ? "i386-linux-gnu" : TripleStr; + // OpenEmbedded does not hardcode the triple to i386-linux-gnu like debian + if (GCCInstallation.getTriple().getVendor() == llvm::Triple::OpenEmbedded) + DebianMultiarch = TripleStr; // Try generic GCC detection first. if (Generic_GCC::addGCCLibStdCxxIncludePaths(DriverArgs, CC1Args,