From b5e84b34c1177c00666eaee6c48f3b0868a395b9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Jul 2021 16:19:17 -0700 Subject: compiler-rt,libcxx: Fix native builds when using RUNTIME=llvm Signed-off-by: Khem Raj (cherry picked from commit e85ba2ec1b2aebbf66ac48f9bd43c22f23a8fcc2) --- recipes-devtools/clang/compiler-rt_git.bb | 2 ++ recipes-devtools/clang/libcxx_git.bb | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 992e42c..665c7b1 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -29,6 +29,8 @@ CXXFLAGS += "-stdlib=libstdc++" LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" BUILD_CXXFLAGS += "-stdlib=libstdc++" BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" +BUILD_CPPFLAGS_remove = "-stdlib=libc++" +BUILD_LDFLAGS_remove = "-stdlib=libc++ -lc++abi" BUILD_CC_toolchain-clang = "${CCACHE}clang" BUILD_CXX_toolchain-clang = "${CCACHE}clang++" diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index 381c62a..b143f8c 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -30,6 +30,11 @@ CC_append_toolchain-clang_class-native = " -unwindlib=libgcc -rtlib=libgcc" CXXFLAGS += "-stdlib=libstdc++" LDFLAGS += "-unwindlib=libgcc -stdlib=libstdc++" +BUILD_CXXFLAGS += "-stdlib=libstdc++" +BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" +BUILD_CPPFLAGS_remove = "-stdlib=libc++" +BUILD_LDFLAGS_remove = "-stdlib=libc++ -lc++abi" + INHIBIT_DEFAULT_DEPS = "1" LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \ -- cgit v1.2.3-54-g00ecf