diff options
| -rw-r--r-- | meta/recipes-devtools/clang/clang_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/clang/clang_git.bb b/meta/recipes-devtools/clang/clang_git.bb index 53bca1c24f..f25633a586 100644 --- a/meta/recipes-devtools/clang/clang_git.bb +++ b/meta/recipes-devtools/clang/clang_git.bb | |||
| @@ -112,7 +112,7 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ | |||
| 112 | -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \ | 112 | -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \ |
| 113 | -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \ | 113 | -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \ |
| 114 | -DCMAKE_SYSTEM_NAME=Linux \ | 114 | -DCMAKE_SYSTEM_NAME=Linux \ |
| 115 | -DCMAKE_BUILD_TYPE=Release \ | 115 | -DCMAKE_BUILD_TYPE=MinSizeRel \ |
| 116 | -DLLVM_ENABLE_PROJECTS='${LLVM_PROJECTS}' \ | 116 | -DLLVM_ENABLE_PROJECTS='${LLVM_PROJECTS}' \ |
| 117 | -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR} \ | 117 | -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR} \ |
| 118 | -DLLVM_VERSION_SUFFIX='${VER_SUFFIX}' \ | 118 | -DLLVM_VERSION_SUFFIX='${VER_SUFFIX}' \ |
| @@ -175,7 +175,7 @@ do_install:append() { | |||
| 175 | 175 | ||
| 176 | do_install:append:class-target () { | 176 | do_install:append:class-target () { |
| 177 | # Allow bin path to change based on YOCTO_ALTERNATE_EXE_PATH | 177 | # Allow bin path to change based on YOCTO_ALTERNATE_EXE_PATH |
| 178 | sed -i 's;${_IMPORT_PREFIX}/bin;${_IMPORT_PREFIX_BIN};g' ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake | 178 | sed -i 's;${_IMPORT_PREFIX}/bin;${_IMPORT_PREFIX_BIN};g' ${D}${libdir}/cmake/llvm/LLVMExports-*.cmake |
| 179 | 179 | ||
| 180 | # Insert function to populate Import Variables | 180 | # Insert function to populate Import Variables |
| 181 | sed -i "4i\ | 181 | sed -i "4i\ |
| @@ -183,7 +183,7 @@ if(DEFINED ENV{YOCTO_ALTERNATE_EXE_PATH})\n\ | |||
| 183 | execute_process(COMMAND \"llvm-config\" \"--bindir\" OUTPUT_VARIABLE _IMPORT_PREFIX_BIN OUTPUT_STRIP_TRAILING_WHITESPACE)\n\ | 183 | execute_process(COMMAND \"llvm-config\" \"--bindir\" OUTPUT_VARIABLE _IMPORT_PREFIX_BIN OUTPUT_STRIP_TRAILING_WHITESPACE)\n\ |
| 184 | else()\n\ | 184 | else()\n\ |
| 185 | set(_IMPORT_PREFIX_BIN \"\${_IMPORT_PREFIX}/bin\")\n\ | 185 | set(_IMPORT_PREFIX_BIN \"\${_IMPORT_PREFIX}/bin\")\n\ |
| 186 | endif()\n" ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake | 186 | endif()\n" ${D}${libdir}/cmake/llvm/LLVMExports-*.cmake |
| 187 | 187 | ||
| 188 | if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then | 188 | if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then |
| 189 | mkdir -p ${D}${nonarch_libdir} | 189 | mkdir -p ${D}${nonarch_libdir} |
