From a7855091d730910093cd3922ec8364b5d7ad9416 Mon Sep 17 00:00:00 2001
|
From: Khem Raj <raj.khem@gmail.com>
|
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
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
---
|
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 4b39c2bdf14d..46c83b002e6c 100644
|
--- a/clang/lib/Driver/ToolChains/Linux.cpp
|
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
|
@@ -619,6 +619,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,
|
