From 773e4b34e507bcb93ee0254ca2fc24cf3e1db81a Mon Sep 17 00:00:00 2001
From: captainurist <73941350+captainurist@users.noreply.github.com>
Date: Tue, 19 Sep 2023 10:01:56 +0800
Subject: [PATCH] Fix linking on x86

---
 .github/workflows/linux.yml | 2 +-
 CMakeLists.txt              | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 2c6e8d86721f..f7d776181ec3 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -113,7 +113,7 @@ jobs:
       - name: Build
         working-directory: build
         run: |
-          make -j3
+          make -j3 VERBOSE=1
 
       - name: Run unit tests
         working-directory: build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f29747b5b9a0..79d9cdcbff5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,11 @@ set(OE_USE_LD_MOLD ON CACHE BOOL "Use mold linker if available.")
 set(OE_USE_LD_LLD ON CACHE BOOL "Use lld linker if available, note that mold takes precedence.")
 set(OE_USE_LD_GOLD ON CACHE BOOL "Use GNU gold linker if available, note that lld takes precedence.")
 
+# Adjust options - we're building x86 ffmpeg statically with --enable-asm, and lld chokes on it.
+if (OE_USE_PREBUILT_DEPENDENCIES AND BUILD_PLATFORM STREQUAL "linux" AND BUILD_ARCH STREQUAL "x86")
+    set(OE_USE_LD_LLD OFF)
+endif()
+
 # Find ccache / sccache.
 if(OE_USE_CCACHE)
     find_program(CCACHE_FOUND ccache)