summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
b5ca98f)
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>
-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
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
Upstream-Status: Inappropriate
Signed-off-by: Roger Zanoni <rzanoni@igalia.com>
---
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 ++
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
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 @@
--- a/build/config/clang/BUILD.gn
+++ b/build/config/clang/BUILD.gn
@@ -3,6 +3,7 @@
import("clang.gni")
if (is_ios) {
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 = ""
}
} 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
+ _base_path = "$clang_base_path_target"
+ _cpu = target_cpu
++ } else {
++ _base_path = "$clang_base_path"
++ _cpu = host_cpu
+ }
+
+ if (_cpu == "x64") {
+ }
+
+ if (_cpu == "x64") {