diff options
author | Michael Davis <michael.davis@essvote.com> | 2019-12-03 10:31:02 -0600 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-12-05 06:52:57 -0800 |
commit | eea276a91c2594b573c82bf82587aa0e502e804f (patch) | |
tree | 543421e06f271ff7c62e2b26a45520c4ffcf5726 /recipes-devtools/clang/clang_git.bb | |
parent | 1295489fa33d80b8fd4a89abb3cce42bc180e883 (diff) | |
download | meta-clang-eea276a91c2594b573c82bf82587aa0e502e804f.tar.gz |
clang: Fix cmake exports not finding native binaries Issue #230
Signed-off-by: Michael Davis <michael.davis@essvote.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools/clang/clang_git.bb')
-rw-r--r-- | recipes-devtools/clang/clang_git.bb | 13 |
1 files changed, 13 insertions, 0 deletions
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() { | |||
171 | rm -rf ${D}${libdir}/python*/site-packages/six.py | 171 | rm -rf ${D}${libdir}/python*/site-packages/six.py |
172 | } | 172 | } |
173 | 173 | ||
174 | do_install_append_class-target () { | ||
175 | # Allow bin path to change based on YOCTO_ALTERNATE_EXE_PATH | ||
176 | sed -i 's;${_IMPORT_PREFIX}/bin;${_IMPORT_PREFIX_BIN};g' ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake | ||
177 | |||
178 | # Insert function to populate Import Variables | ||
179 | sed -i "4i\ | ||
180 | if(DEFINED ENV{YOCTO_ALTERNATE_EXE_PATH})\n\ | ||
181 | execute_process(COMMAND \"llvm-config\" \"--bindir\" OUTPUT_VARIABLE _IMPORT_PREFIX_BIN OUTPUT_STRIP_TRAILING_WHITESPACE)\n\ | ||
182 | else()\n\ | ||
183 | set(_IMPORT_PREFIX_BINARY \"\${_IMPORT_PREFIX}/bin\")\n\ | ||
184 | endif()\n" ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake | ||
185 | } | ||
186 | |||
174 | do_install_append_class-native () { | 187 | do_install_append_class-native () { |
175 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen | 188 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen |
176 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen | 189 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen |