Fix linking on x86

captainurist · Sep 19, 2023 · 463f048 · 463f048
1 parent c0ed4de
commit 463f048
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
@@ -60,6 +60,11 @@ check_linker_flag(CXX "-fuse-ld=mold" COMPILER_RT_HAS_FUSE_LD_MOLD_FLAG)
 check_linker_flag(CXX "-fuse-ld=lld" COMPILER_RT_HAS_FUSE_LD_LLD_FLAG)
 check_linker_flag(CXX "-fuse-ld=gold" COMPILER_RT_HAS_FUSE_LD_GOLD_FLAG)
 
+# Adjust available linkers. On x86 linux we're building ffmpeg statically with --enable-asm, and lld chokes on it.
+if (COMPILER_RT_HAS_FUSE_LD_LLD_FLAG AND OE_USE_PREBUILT_DEPENDENCIES AND BUILD_PLATFORM STREQUAL "linux" AND BUILD_ARCH STREQUAL "x86")
+    set(COMPILER_RT_HAS_FUSE_LD_LLD_FLAG OFF)
+endif()
+
 # Set compiler options.
 # We do a lot of tweaks here.
 add_compile_definitions(FMT_USE_NONTYPE_TEMPLATE_ARGS) # Enable _cf literals