summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-08-13 12:21:50 -0700
committerKhem Raj <raj.khem@gmail.com>2021-08-13 12:21:50 -0700
commit67803c1e3b1ef7f893bf20005d0fbad13fd82ef1 (patch)
treefa2c5ca4f5da96665d2379810d4a251908c37693
parenta8b94b0a778da4a4b9547401c71a908abec4e803 (diff)
downloadmeta-clang-67803c1e3b1ef7f893bf20005d0fbad13fd82ef1.tar.gz
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 <raj.khem@gmail.com>
-rw-r--r--dynamic-layers/chromium-browser-layer/recipes-browser/chromium-ozone-wayland_%.bbappend6
-rw-r--r--dynamic-layers/chromium-browser-layer/recipes-browser/chromium-x11_%.bbappend6
-rw-r--r--dynamic-layers/chromium-browser-layer/recipes-browser/gn-native_%.bbappend6
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"
4 4
5UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" 5UNWINDLIB_toolchain-clang = "--unwindlib=libgcc"
6 6
7DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" 7DEPEND_remove = "compiler-rt-native libcxx-native"
8 8
9BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" 9BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++"
10BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" 10BUILD_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"
4 4
5UNWINDLIB_toolchain-clang = "--unwindlib=libgcc" 5UNWINDLIB_toolchain-clang = "--unwindlib=libgcc"
6 6
7DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" 7DEPEND_remove = "compiler-rt-native libcxx-native"
8 8
9BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" 9BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++"
10BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" 10BUILD_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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3DEPEND_remove_runtime-llvm = "compiler-rt-native libcxx-native" 3DEPEND_remove = "compiler-rt-native libcxx-native"
4 4
5BUILD_CPPFLAGS_remove_rumtime-llvm = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++" 5CXXFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++"
6BUILD_LDFLAGS_remove_runtime-llvm = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}" 6LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}"