Merge pull request #565 from kraj/kraj/clang12

merge dunfell branch into clang12

4 files changed, 28 insertions, 2 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 2f9d6f8..19e348b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,8 +11,8 @@ LAYERSERIES_COMPAT_clang-layer = "dunfell hardknott honister"
 LAYERDEPENDS_clang-layer = "core"
 
 BBFILES_DYNAMIC += " \
-    browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bb \
-    browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*/*.bbappend \
+    chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*.bb \
+    chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*.bbappend \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
     networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
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
new file mode 100644
index 0000000..ff82a79
--- /dev/null
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+GN_ARGS += "use_lld=true use_gold=false"
+
+UNWINDLIB_toolchain-clang = "--unwindlib=libgcc"
+
+DEPENDS_remove = "compiler-rt-native libcxx-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
new file mode 100644
index 0000000..ff82a79
--- /dev/null
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+GN_ARGS += "use_lld=true use_gold=false"
+
+UNWINDLIB_toolchain-clang = "--unwindlib=libgcc"
+
+DEPENDS_remove = "compiler-rt-native libcxx-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
new file mode 100644
index 0000000..cd60c58
--- /dev/null
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+DEPENDS_remove = "compiler-rt-native libcxx-native"
+
+CXXFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++"
+LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}"