Fix linking on x86

captainurist · Sep 19, 2023 · 773e4b3 · 773e4b3
1 parent c0ed4de
commit 773e4b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)