From df21b1563910c80d7e2964971b7c5b79b5186922 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 4 Jul 2024 16:53:36 -0700 Subject: libcxx: Do not induce -mbranch-protection externally on arm64 On arm64 OE-Core has moved the gcc default configuration done with --enable-standard-branch-protection to be a CFLAGS option which is appended to CC variable, this means that this option can override the package's default to not use it e.g. libunwind where the library has to be built without it. Fixes https://github.com/kraj/meta-clang/issues/963 Signed-off-by: Khem Raj Signed-off-by: Jose Quaresma --- recipes-devtools/clang/libcxx_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-devtools') diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index 9d4f033..a6f2e66 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -41,6 +41,7 @@ BUILD_CXXFLAGS += "-stdlib=libstdc++" BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" BUILD_CPPFLAGS:remove = "-stdlib=libc++" BUILD_LDFLAGS:remove = "-stdlib=libc++ -lc++abi" +TUNE_CCARGS:remove = "-mbranch-protection=standard" INHIBIT_DEFAULT_DEPS = "1" -- cgit v1.2.3-54-g00ecf