From b0ea3c65c281a6a31d4904460e4cac0dc20b51f0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Dec 2022 22:59:38 -0800 Subject: clang: Inherit python3targetconfig Ensure that lldb uses correct python-dev headers from target python and not native python during cross compile. Adjust *_PYTHON_* variables accordingly. Signed-off-by: Khem Raj Signed-off-by: Chee Yang Lee --- recipes-devtools/clang/clang_git.bb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index 80ff2a4..fe32a68 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" LDFLAGS:append:class-target:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" LDFLAGS:append:class-target:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" -inherit cmake cmake-native pkgconfig python3native +inherit cmake cmake-native pkgconfig python3native python3targetconfig OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" @@ -177,9 +177,6 @@ EXTRA_OECMAKE:append:class-nativesdk = "\ " EXTRA_OECMAKE:append:class-target = "\ -DCMAKE_CROSSCOMPILING:BOOL=ON \ - -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ - -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ - -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON}' \ -DLLVM_USE_HOST_TOOLS=OFF \ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ @@ -193,13 +190,12 @@ EXTRA_OECMAKE:append:class-target = "\ -DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \ -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS}${HF} \ -DLLVM_HOST_TRIPLE=${TARGET_SYS}${HF} \ - -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ - -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \ - -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ - -DPYTHON_EXECUTABLE='${PYTHON}' \ + -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ + -DLLDB_PYTHON_EXE_RELATIVE_PATH=${bindir} \ + -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ " DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native" -- cgit v1.2.3-54-g00ecf