From 67803c1e3b1ef7f893bf20005d0fbad13fd82ef1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 13 Aug 2021 12:21:50 -0700 Subject: chromium,gn: Do not use runtime-llvm to remove libc++ native deps This override may not exist in old releases Signed-off-by: Khem Raj --- .../recipes-browser/chromium-ozone-wayland_%.bbappend | 6 +++--- .../chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend | 6 +++--- .../chromium-browser-layer/recipes-browser/gn-native_%.bbappend | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend index e6c0d5c..8d3819e 100644 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend @@ -4,7 +4,7 @@ GN_ARGS += "use_lld=true use_gold=false" UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" -DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" +DEPEND_remove = "compiler-rt-native libcxx-native" -BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" -BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" +BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" +BUILD_LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend index e6c0d5c..8d3819e 100644 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend @@ -4,7 +4,7 @@ GN_ARGS += "use_lld=true use_gold=false" UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" -DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" +DEPEND_remove = "compiler-rt-native libcxx-native" -BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" -BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" +BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" +BUILD_LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend index 9fcb978..5901875 100644 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" +DEPEND_remove = "compiler-rt-native libcxx-native" -BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" -BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" +CXXFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" +LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" -- cgit v1.2.3-54-g00ecf