From bff7a401519dfb6aa4925c71c50d74a2d44b368f Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 18 Sep 2019 13:53:11 +0800 Subject: libcxx: support multilib Use LLVM_LIBDIR_SUFFIX with the correct value of suffix derived using baselib. Signed-off-by: Anuj Mittal --- recipes-devtools/clang/libcxx_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes-devtools/clang') diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index e6e7e36..c88d868 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -44,11 +44,12 @@ EXTRA_OECMAKE += "\ -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \ -DLIBCXXABI_LIBCXX_INCLUDES=${S}/libcxx/include \ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/libcxxabi/include \ - -DLIBCXX_CXX_ABI_LIBRARY_PATH=${B}/lib \ + -DLIBCXX_CXX_ABI_LIBRARY_PATH=${B}/${baselib} \ -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi${LIBUNWIND}' \ + -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -G Ninja \ ${S}/llvm \ " -- cgit v1.2.3-54-g00ecf