From eea276a91c2594b573c82bf82587aa0e502e804f Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Tue, 3 Dec 2019 10:31:02 -0600 Subject: clang: Fix cmake exports not finding native binaries Issue #230 Signed-off-by: Michael Davis Signed-off-by: Khem Raj --- recipes-devtools/clang/clang_git.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'recipes-devtools/clang/clang_git.bb') diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index 59d3d19..3645b4e 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb @@ -171,6 +171,19 @@ do_install() { rm -rf ${D}${libdir}/python*/site-packages/six.py } +do_install_append_class-target () { + # Allow bin path to change based on YOCTO_ALTERNATE_EXE_PATH + sed -i 's;${_IMPORT_PREFIX}/bin;${_IMPORT_PREFIX_BIN};g' ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake + + # Insert function to populate Import Variables + sed -i "4i\ +if(DEFINED ENV{YOCTO_ALTERNATE_EXE_PATH})\n\ + execute_process(COMMAND \"llvm-config\" \"--bindir\" OUTPUT_VARIABLE _IMPORT_PREFIX_BIN OUTPUT_STRIP_TRAILING_WHITESPACE)\n\ +else()\n\ + set(_IMPORT_PREFIX_BINARY \"\${_IMPORT_PREFIX}/bin\")\n\ +endif()\n" ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake +} + do_install_append_class-native () { install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen -- cgit v1.2.3-54-g00ecf