diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-09-18 13:56:35 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-18 15:24:00 -0700 |
commit | f1b2bca4f51623b3605468d629dec7508a1db149 (patch) | |
tree | 202e96750aa20a69c26f3f51c7bd307483ba3388 | |
parent | 8396a768cb075a32a977db81d9f195084c5e99c4 (diff) | |
download | meta-clang-f1b2bca4f51623b3605468d629dec7508a1db149.tar.gz |
clang: pass PYTHON_EXECUTABLE to target as well
Also make sure that we pass this value on to an internal native build that
tries to detect python while cross-compiling.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r-- | recipes-devtools/clang/clang/0001-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch | 25 | ||||
-rw-r--r-- | recipes-devtools/clang/clang_git.bb | 1 | ||||
-rw-r--r-- | recipes-devtools/clang/common.inc | 1 |
3 files changed, 27 insertions, 0 deletions
diff --git a/recipes-devtools/clang/clang/0001-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch b/recipes-devtools/clang/clang/0001-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch new file mode 100644 index 0000000..ab3c837 --- /dev/null +++ b/recipes-devtools/clang/clang/0001-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 112a89e845333ae98e9802c5ac5a4761032e08de Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 18 Sep 2019 12:56:58 +0800 | ||
4 | Subject: [PATCH] Pass PYTHON_EXECUTABLE when cross compiling for native build | ||
5 | |||
6 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
7 | --- | ||
8 | llvm/cmake/modules/CrossCompile.cmake | 1 + | ||
9 | 1 file changed, 1 insertion(+) | ||
10 | |||
11 | diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake | ||
12 | index d6b4161..7fae108 100644 | ||
13 | --- a/llvm/cmake/modules/CrossCompile.cmake | ||
14 | +++ b/llvm/cmake/modules/CrossCompile.cmake | ||
15 | @@ -62,6 +62,7 @@ function(llvm_create_cross_target_internal target_name toolchain buildtype) | ||
16 | -DLLVM_ENABLE_PROJECTS="${llvm_enable_projects_arg}" | ||
17 | -DLLVM_EXTERNAL_PROJECTS="${llvm_external_projects_arg}" | ||
18 | -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN="${LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN}" | ||
19 | + -DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}" | ||
20 | ${build_type_flags} ${linker_flag} ${external_clang_dir} | ||
21 | WORKING_DIRECTORY ${LLVM_${target_name}_BUILD} | ||
22 | DEPENDS CREATE_LLVM_${target_name} | ||
23 | -- | ||
24 | 2.7.4 | ||
25 | |||
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index 49691d5..c186cc7 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb | |||
@@ -147,6 +147,7 @@ EXTRA_OECMAKE_append_class-target = "\ | |||
147 | -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ | 147 | -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ |
148 | -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ | 148 | -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ |
149 | -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ | 149 | -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ |
150 | -DPYTHON_EXECUTABLE='${PYTHON}' \ | ||
150 | " | 151 | " |
151 | 152 | ||
152 | DEPENDS = "binutils zlib libffi libedit libedit-native libxml2 libxml2-native ninja-native swig-native" | 153 | DEPENDS = "binutils zlib libffi libedit libedit-native libxml2 libxml2-native ninja-native swig-native" |
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc index ceb9daa..955c3cc 100644 --- a/recipes-devtools/clang/common.inc +++ b/recipes-devtools/clang/common.inc | |||
@@ -30,6 +30,7 @@ SRC_URI = "\ | |||
30 | file://0020-clang-default-to-lp64d-ABI-and-rv64gc-ISA.patch \ | 30 | file://0020-clang-default-to-lp64d-ABI-and-rv64gc-ISA.patch \ |
31 | file://0022-Driver-Prioritize-SYSROOT-usr-include-over-RESOURCE_.patch \ | 31 | file://0022-Driver-Prioritize-SYSROOT-usr-include-over-RESOURCE_.patch \ |
32 | file://0023-RISCV-Add-support-for-floating-point-registers-in-in.patch \ | 32 | file://0023-RISCV-Add-support-for-floating-point-registers-in-in.patch \ |
33 | file://0001-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch \ | ||
33 | " | 34 | " |
34 | 35 | ||
35 | # Fallback to no-PIE if not set | 36 | # Fallback to no-PIE if not set |