summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-04-29 14:22:33 +0200
committerKhem Raj <raj.khem@gmail.com>2023-05-10 09:59:20 -0700
commit366ad9356c3e982c51350773e3c9e7f7b2ff0bab (patch)
tree5beff84cfae61eacb0c03e8e7eec3b87c5ccdea8
parentaa46b8e9599c1d3cc165b79355100adbc4c8effa (diff)
downloadmeta-clang-366ad9356c3e982c51350773e3c9e7f7b2ff0bab.tar.gz
Revert "clang: Inherit python3targetconfig"
This reverts commit b0ea3c65c281a6a31d4904460e4cac0dc20b51f0. This causes target clang to fail building with langdale: work-shared/llvm-project-source-15.0.6-r0/git/lldb/CMakeLists.txt:60 (message): | Crosscompiling LLDB with Python requires manually setting | LLDB_PYTHON_RELATIVE_PATH. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-devtools/clang/clang_git.bb12
1 files changed, 8 insertions, 4 deletions
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 69b45e0..b9df4b2 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -20,7 +20,7 @@ LDFLAGS:remove:class-nativesdk = "-fuse-ld=lld"
20LDFLAGS:append:class-target:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" 20LDFLAGS:append:class-target:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
21LDFLAGS:append:class-target:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" 21LDFLAGS:append:class-target:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
22 22
23inherit cmake cmake-native pkgconfig python3native python3targetconfig 23inherit cmake cmake-native pkgconfig python3native
24 24
25OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" 25OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
26 26
@@ -177,6 +177,9 @@ EXTRA_OECMAKE:append:class-nativesdk = "\
177" 177"
178EXTRA_OECMAKE:append:class-target = "\ 178EXTRA_OECMAKE:append:class-target = "\
179 -DCMAKE_CROSSCOMPILING:BOOL=ON \ 179 -DCMAKE_CROSSCOMPILING:BOOL=ON \
180 -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \
181 -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \
182 -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON}' \
180 -DLLVM_USE_HOST_TOOLS=OFF \ 183 -DLLVM_USE_HOST_TOOLS=OFF \
181 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ 184 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
182 -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ 185 -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \
@@ -190,12 +193,13 @@ EXTRA_OECMAKE:append:class-target = "\
190 -DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \ 193 -DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \
191 -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS}${HF} \ 194 -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS}${HF} \
192 -DLLVM_HOST_TRIPLE=${TARGET_SYS}${HF} \ 195 -DLLVM_HOST_TRIPLE=${TARGET_SYS}${HF} \
196 -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \
197 -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \
198 -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \
193 -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ 199 -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \
194 -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ 200 -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
195 -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ 201 -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
196 -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ 202 -DPYTHON_EXECUTABLE='${PYTHON}' \
197 -DLLDB_PYTHON_EXE_RELATIVE_PATH=${bindir} \
198 -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \
199" 203"
200 204
201DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native" 205DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native"