diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-09-18 13:53:11 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-18 15:24:00 -0700 |
commit | bff7a401519dfb6aa4925c71c50d74a2d44b368f (patch) | |
tree | 933a20267c0fec20a37ceeab50b4b8509d152e27 | |
parent | 78362787f9e827ecb5dad9c44040f05a545f3ebe (diff) | |
download | meta-clang-bff7a401519dfb6aa4925c71c50d74a2d44b368f.tar.gz |
libcxx: support multilib
Use LLVM_LIBDIR_SUFFIX with the correct value of suffix derived using baselib.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r-- | recipes-devtools/clang/libcxx_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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 += "\ | |||
44 | -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \ | 44 | -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \ |
45 | -DLIBCXXABI_LIBCXX_INCLUDES=${S}/libcxx/include \ | 45 | -DLIBCXXABI_LIBCXX_INCLUDES=${S}/libcxx/include \ |
46 | -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/libcxxabi/include \ | 46 | -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/libcxxabi/include \ |
47 | -DLIBCXX_CXX_ABI_LIBRARY_PATH=${B}/lib \ | 47 | -DLIBCXX_CXX_ABI_LIBRARY_PATH=${B}/${baselib} \ |
48 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ | 48 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ |
49 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ | 49 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ |
50 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ | 50 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ |
51 | -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi${LIBUNWIND}' \ | 51 | -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi${LIBUNWIND}' \ |
52 | -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ | ||
52 | -G Ninja \ | 53 | -G Ninja \ |
53 | ${S}/llvm \ | 54 | ${S}/llvm \ |
54 | " | 55 | " |