diff options
author | Ross Burton <ross.burton@intel.com> | 2019-03-27 23:07:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-29 08:28:53 +0000 |
commit | 594ac9ddff3ccc95a2bde58897d59ce4597be6a8 (patch) | |
tree | 262bd69a9ad1f6464de967bae2b8f7da256bc8ed | |
parent | 149fd646fa3d8fc529d1828d0669b83df07676fb (diff) | |
download | poky-594ac9ddff3ccc95a2bde58897d59ce4597be6a8.tar.gz |
llvm: doesn't actually need pythonnative
LLVM doesn't actually need pythonnative, the host Python2 is sufficient but
cmake's executable searching currently isn't reliable in cross-compilations.
Convince cmake by setting PYTHON_EXECUTABLE to point at python2 in the HOSTTOOLS
directory. Note that currently LLVM *needs* python2 currently:
https://github.com/llvm-mirror/llvm/blob/master/CMakeLists.txt#L670
(From OE-Core rev: 1587475e45edc995b7643844594abc94160a5549)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/llvm/llvm_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index d2ea927651..31abadcace 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb | |||
@@ -12,7 +12,7 @@ DEPENDS = "libffi libxml2 zlib ninja-native llvm-native" | |||
12 | 12 | ||
13 | RDEPENDS_${PN}_append_class-target = " ncurses-terminfo" | 13 | RDEPENDS_${PN}_append_class-target = " ncurses-terminfo" |
14 | 14 | ||
15 | inherit perlnative pythonnative cmake pkgconfig | 15 | inherit perlnative cmake pkgconfig |
16 | 16 | ||
17 | PROVIDES += "llvm${PV}" | 17 | PROVIDES += "llvm${PV}" |
18 | 18 | ||
@@ -74,6 +74,7 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ | |||
74 | -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \ | 74 | -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \ |
75 | -DLLVM_OPTIMIZED_TABLEGEN=ON \ | 75 | -DLLVM_OPTIMIZED_TABLEGEN=ON \ |
76 | -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS}' \ | 76 | -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS}' \ |
77 | -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python2 \ | ||
77 | -G Ninja" | 78 | -G Ninja" |
78 | 79 | ||
79 | EXTRA_OECMAKE_append_class-target = "\ | 80 | EXTRA_OECMAKE_append_class-target = "\ |