summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-04-20 09:43:23 +0200
committerMichal Klocek <michal.klocek@qt.io>2022-05-03 16:16:15 +0000
commit6156c93cb921ab543a1450840581adeb1e2db3b3 (patch)
tree977c350d77ddd8f01df99e76881173f085dc3552
parent07a64cf64f812db90e37e4c59472821d8af44d2b (diff)
downloadqtwebengine-chromium-6156c93cb921ab543a1450840581adeb1e2db3b3.tar.gz
Fix linking when cross-compiling arm64->x86_64
For some unknown reason linker fails on 90-based due to unresolved symbols for libaom for its internal objects. Set final linkage to use object files instead of archive. Note this is not an issue with 94-based and it is not related to source code of libaom. Also universal builds are not affected as we do 'intermediate' object file before final linkage. Change-Id: Icf7110cbe5af11d6ab27bf921f512beca7afa9fd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/libaom/BUILD.gn2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/libaom/BUILD.gn b/chromium/third_party/libaom/BUILD.gn
index 9b065bd7b17..51ab02734b6 100644
--- a/chromium/third_party/libaom/BUILD.gn
+++ b/chromium/third_party/libaom/BUILD.gn
@@ -206,7 +206,7 @@ if (enable_libaom) {
}
}
- static_library("libaom") {
+ source_set("libaom") {
if (!is_debug && is_win) {
configs -= [ "//build/config/compiler:default_optimization" ]
configs += [ "//build/config/compiler:optimize_max" ]