0023-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch 1.2 KB

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