diff options
| author |   Roger Zanoni <rzanoni@igalia.com> | 2023-11-24 02:55:50 +0000 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-11-24 14:24:02 +0000 |
| commit | cfdddcb0179fe143a7a37399b0365ff871db746e (patch) | |
| tree | b9e8a0406beec9bb422d1fe009a1248037a6f34f /recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch | |
| parent | b5ca98fe204a7ec6f4a1cf84c19ffeb5f4deb128 (diff) | |
[cef] Fix cef build for renesas
The logic to check if the current toolchain was target or host was wrong and a
linker error(for libvk_swiftshader.so) started to happen after 29449 and 29419:
aarch64-agl-linux-ld.lld: error:
.../clang/14.0.6/lib/linux/libclang_rt.builtins-x86_64.a(clear_cache.c.o)
is incompatible with elf64-littleaarch64
The fix makes use of the chromium gn variable created for checking if the
current toolchain is a target build.
Bug-AGL: SPEC-4976
Signed-off-by: Roger Zanoni <rzanoni@igalia.com>
Change-Id: Ibd6c6ab9c85951a2b8933c7c1c7107c3f94b59ec
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29420
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Tested-by: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch')
| -rw-r--r-- | recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch b/recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch index fa4dfe60d..fa049e1b8 100644 --- a/recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch +++ b/recipes-wam/cef/files/chromium/0031-M118-fix-Add-a-way-to-set-different-lib-paths-host-a.patch @@ -1,4 +1,4 @@ -From e1bc5ea870e17afee145009194e6f2092dd1d3ff Mon Sep 17 00:00:00 2001 +From e376fd5fa64d34803e821e02c0d5199ca7244944 Mon Sep 17 00:00:00 2001 From: Roger Zanoni <rzanoni@igalia.com> Date: Sun, 12 Nov 2023 19:41:07 -0300 Subject: [PATCH 31/33] [M118-fix] Add a way to set different lib paths host @@ -10,12 +10,12 @@ runtime libraries and a different lib naming convention. Upstream-Status: Inappropriate Signed-off-by: Roger Zanoni <rzanoni@igalia.com> --- - build/config/clang/BUILD.gn | 80 +++++++++++------------------------- + build/config/clang/BUILD.gn | 79 +++++++++++------------------------- build/config/clang/clang.gni | 3 ++ - 2 files changed, 27 insertions(+), 56 deletions(-) + 2 files changed, 26 insertions(+), 56 deletions(-) diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn -index fe044e29e428b..33edce7aed9a2 100644 +index fe044e29e428b..81ec24d92da72 100644 --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn @@ -3,6 +3,7 @@ @@ -26,18 +26,17 @@ index fe044e29e428b..33edce7aed9a2 100644 import("clang.gni") if (is_ios) { -@@ -95,66 +96,33 @@ template("clang_lib") { +@@ -95,66 +96,32 @@ template("clang_lib") { } } else { config(target_name) { - _dir = "" -+ if (current_toolchain == host_toolchain || -+ current_toolchain == v8_snapshot_toolchain) { -+ _base_path = "$clang_base_path" -+ _cpu = host_cpu -+ } else { ++ if (is_a_target_toolchain) { + _base_path = "$clang_base_path_target" + _cpu = target_cpu ++ } else { ++ _base_path = "$clang_base_path" ++ _cpu = host_cpu + } + + if (_cpu == "x64") { |