From ab61d13f4f1aa0ecd71dc64a485a48e324f84c2e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 30 Sep 2019 14:26:01 -0700 Subject: libcxx: Pass OE LDFLAGS via CMAKE_SHARED_LINKER_FLAGS setting these flags via CMake cmdline means that LDFLAGS that OE expects to insert via environment wont be respected anymore, therefore its better to pass it along during configure, so we get the desired flags into linker Fixes Issue #188 Signed-off-by: Khem Raj --- recipes-devtools/clang/libcxx_git.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'recipes-devtools/clang/libcxx_git.bb') diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index ed07f2e..10c20fe 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -25,16 +25,17 @@ THUMB_TUNE_CCARGS = "" EXTRA_OECMAKE += "\ -DCMAKE_CROSSCOMPILING=ON \ - -DLIBCXX_CXX_ABI=libcxxabi \ - -DLIBCXX_USE_COMPILER_RT=ON \ + -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ + -DLIBCXXABI_INCLUDE_TESTS=OFF \ + -DLIBCXXABI_ENABLE_SHARED=ON \ -DLIBCXXABI_USE_COMPILER_RT=ON \ - -DLIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \ - -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \ - -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \ -DLIBCXXABI_LIBCXX_INCLUDES=${S}/libcxx/include \ + -DLIBCXXABI_USE_LLVM_UNWINDER=ON \ + -DLIBCXX_CXX_ABI=libcxxabi \ + -DLIBCXX_USE_COMPILER_RT=ON \ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/libcxxabi/include \ -DLIBCXX_CXX_ABI_LIBRARY_PATH=${B}/${baselib} \ - -DCMAKE_SHARED_LINKER_FLAGS='${SHAREDFLAGS}' \ + -DCMAKE_SHARED_LINKER_FLAGS='${LDFLAGS} ${SHAREDFLAGS}' \ -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ -- cgit v1.2.3-54-g00ecf