diff options
6 files changed, 28 insertions, 12 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index c0a422f..fdea56c 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -11,8 +11,8 @@ LAYERSERIES_COMPAT_clang-layer = "zeus dunfell" | |||
11 | LAYERDEPENDS_clang-layer = "core" | 11 | LAYERDEPENDS_clang-layer = "core" |
12 | 12 | ||
13 | BBFILES_DYNAMIC += " \ | 13 | BBFILES_DYNAMIC += " \ |
14 | browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*.bb \ | 14 | chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*.bb \ |
15 | browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*.bbappend \ | 15 | chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/*/*.bbappend \ |
16 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ | 16 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ |
17 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ | 17 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ |
18 | networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ | 18 | networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ |
diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend b/dynamic-layers/browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend deleted file mode 100644 index 1805554..0000000 --- a/dynamic-layers/browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | GN_ARGS += "use_lld=true use_gold=false" | ||
4 | |||
5 | UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" | ||
diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium-x11_%.bbappend b/dynamic-layers/browser-layer/recipes-browser/chromium-x11_%.bbappend deleted file mode 100644 index 1805554..0000000 --- a/dynamic-layers/browser-layer/recipes-browser/chromium-x11_%.bbappend +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | GN_ARGS += "use_lld=true use_gold=false" | ||
4 | |||
5 | UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" | ||
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..e6c0d5c --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend | |||
@@ -0,0 +1,10 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | GN_ARGS += "use_lld=true use_gold=false" | ||
4 | |||
5 | UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" | ||
6 | |||
7 | DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" | ||
8 | |||
9 | BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" | ||
10 | BUILD_LDFLAGS_remove_runtime-llvm = "-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..e6c0d5c --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend | |||
@@ -0,0 +1,10 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | GN_ARGS += "use_lld=true use_gold=false" | ||
4 | |||
5 | UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" | ||
6 | |||
7 | DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" | ||
8 | |||
9 | BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" | ||
10 | BUILD_LDFLAGS_remove_runtime-llvm = "-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..9fcb978 --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend | |||
@@ -0,0 +1,6 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" | ||
4 | |||
5 | BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" | ||
6 | BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" | ||