12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 |
- From 1545fd910e641757705cb580a15ba6cd511be72e Mon Sep 17 00:00:00 2001
- From: Jun Yuan Tan <junyuan.tan@starfivetech.com>
- Date: Tue, 9 Nov 2021 10:15:04 +0800
- Subject: [PATCH 11/34] clang: Define / releative gcc installation dir
- This is required for OE gcc installation to work.
- Without this its not able to find the paths for libgcc
- and other standard headers and libraries from gcc
- installation in OE
- Rebased to LLVM 14.0.0 by Jun Yuan Tan
- Signed-off-by: Khem Raj <raj.khem@gmail.com>
- Signed-off-by: Jun Yuan Tan <junyuan.tan@starfivetech.com>
- ---
- clang/lib/Driver/ToolChains/Gnu.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
- diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
- index 278064d9edca..31d1c5c756fd 100644
- --- a/clang/lib/Driver/ToolChains/Gnu.cpp
- +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
- @@ -2534,19 +2534,19 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
- // Whether this library suffix is relevant for the triple.
- bool Active;
- } Suffixes[] = {
- - // This is the normal place.
- - {"gcc/" + CandidateTriple.str(), "../..", GCCDirExists},
- -
- - // Debian puts cross-compilers in gcc-cross.
- - {"gcc-cross/" + CandidateTriple.str(), "../..", GCCCrossDirExists},
- -
- // The Freescale PPC SDK has the gcc libraries in
- // <sysroot>/usr/lib/<triple>/x.y.z so have a look there as well. Only do
- // this on Freescale triples, though, since some systems put a *lot* of
- // files in that location, not just GCC installation data.
- {CandidateTriple.str(), "..",
- TargetTriple.getVendor() == llvm::Triple::Freescale ||
- - TargetTriple.getVendor() == llvm::Triple::OpenEmbedded}};
- + TargetTriple.getVendor() == llvm::Triple::OpenEmbedded},
- +
- + // This is the normal place.
- + {"gcc/" + CandidateTriple.str(), "../..", GCCDirExists},
- +
- + // Debian puts cross-compilers in gcc-cross.
- + {"gcc-cross/" + CandidateTriple.str(), "../..", GCCCrossDirExists}};
-
- for (auto &Suffix : Suffixes) {
- if (!Suffix.Active)
- --
- 2.33.1
|