diff options
Diffstat (limited to 'recipes-devtools/clang')
-rw-r--r-- | recipes-devtools/clang/clang_git.bb | 13 | ||||
-rw-r--r-- | recipes-devtools/clang/llvm-common/llvm-config | 5 |
2 files changed, 18 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 |
diff --git a/recipes-devtools/clang/llvm-common/llvm-config b/recipes-devtools/clang/llvm-common/llvm-config index 4462896..a139514 100644 --- a/recipes-devtools/clang/llvm-common/llvm-config +++ b/recipes-devtools/clang/llvm-common/llvm-config | |||
@@ -18,6 +18,11 @@ if [[ $1 == "--libs" ]]; then | |||
18 | exec "$NEXT_LLVM_CONFIG" $@ | 18 | exec "$NEXT_LLVM_CONFIG" $@ |
19 | fi | 19 | fi |
20 | 20 | ||
21 | if [[ $1 == "--bindir" ]]; then | ||
22 | unset YOCTO_ALTERNATE_EXE_PATH | ||
23 | exec "$NEXT_LLVM_CONFIG" $@ | ||
24 | fi | ||
25 | |||
21 | for arg in "$@"; do | 26 | for arg in "$@"; do |
22 | case "$arg" in | 27 | case "$arg" in |
23 | --cppflags) | 28 | --cppflags) |