From 7cdc7ff4cdfbd75083ec37ed2e8a380f48fb692c Mon Sep 17 00:00:00 2001
From: Jim Broadus <jbroadus@xevo.com>
Date: Fri, 27 Mar 2020 13:06:08 -0700
Subject: clang: Fix default resources directory when cross compiling

By default, clang looks for resourses relative to the binary location:
${location}/../lib/clang/${version}/
However, the default bindir defined in cross.bbclass is a subdirectory of bin,
so clang forms a directory that looks like /usr/bin/lib/clang/10.0.0/

Apply a patch to use ${location}/../../lib/clang/${version} if the directory
name of ${location}/.. is "bin".

Signed-off-by: Jim Broadus <jbroadus@xevo.com>
---
 ...esource-dir-location-for-cross-toolchains.patch | 41 ++++++++++++++++++++++
 recipes-devtools/clang/common.inc                  |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 recipes-devtools/clang/clang/0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch

diff --git a/recipes-devtools/clang/clang/0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch b/recipes-devtools/clang/clang/0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch
new file mode 100644
index 0000000..decab68
--- /dev/null
+++ b/recipes-devtools/clang/clang/0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch
@@ -0,0 +1,41 @@
+From ed3b5d8bb197f01556b42dfc2281693475fd830e Mon Sep 17 00:00:00 2001
+From: Jim Broadus <jbroadus@xevo.com>
+Date: Thu, 26 Mar 2020 16:05:53 -0700
+Subject: [PATCH] clang: Fix resource dir location for cross toolchains
+
+When clang looks for the resources directory, it does so based on the binary
+location and assumes that the containing directory is a sibling to lib. The
+Yocto cross.bbclass defines the default bindir as
+${exec_prefix}/bin/${CROSS_TARGET_SYS_DIR}. ex: /usr/bin/aarch64-poky-linux/.
+This causes clang to form a path that looks like /usr/bin/lib/clang/...
+
+As a fix for this, check the parent directory name. If that is "bin", then
+use that directory's parent.
+
+Signed-off-by: Jim Broadus <jbroadus@xevo.com>
+---
+ clang/lib/Driver/Driver.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
+index fb8335a3695..819887944b5 100644
+--- a/clang/lib/Driver/Driver.cpp
++++ b/clang/lib/Driver/Driver.cpp
+@@ -110,7 +110,13 @@ std::string Driver::GetResourcesPath(StringRef BinaryPath,
+     // With a static-library build of libclang, LibClangPath will contain the
+     // path of the embedding binary, which for LLVM binaries will be in bin/.
+     // ../lib gets us to lib/ in both cases.
+-    P = llvm::sys::path::parent_path(Dir);
++    Dir = llvm::sys::path::parent_path(Dir);
++
++    // OE cross toolchains are installed, by default, in a subdir of bin.
++    if (llvm::sys::path::filename(Dir) == "bin") {
++      Dir = llvm::sys::path::parent_path(Dir);
++    }
++    P = Dir;
+     llvm::sys::path::append(P, Twine("lib") + CLANG_LIBDIR_SUFFIX, "clang",
+                             CLANG_VERSION_STRING);
+   }
+-- 
+2.24.1
+
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 89696c2..c45e24c 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -30,6 +30,7 @@ SRC_URI = "\
     file://0020-clang-Enable-SSP-and-PIE-by-default.patch \
     file://0021-libcxx-Add-compiler-runtime-library-to-link-step-for.patch \
     file://0022-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch \
+    file://0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch \
 "
 
 # Fallback to no-PIE if not set
-- 
cgit v1.2.3-54-g00ecf