From 2c948b873effdce80e7921686f2f2e60ad625eee Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 4 Jun 2025 11:34:01 +0200 Subject: [PATCH] Build: Make libraries compile on Linux ARM64 again NASM is an x86 assembler, doesn't work on ARM. --- build_files/build_environment/cmake/x264.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake index 9d771e4dcc6..1485960ba9d 100644 --- a/build_files/build_environment/cmake/x264.cmake +++ b/build_files/build_environment/cmake/x264.cmake @@ -6,7 +6,7 @@ if(WIN32) set(X264_EXTRA_ARGS --enable-win32thread) endif() -if((APPLE AND NOT BLENDER_PLATFORM_ARM) OR (UNIX AND NOT APPLE)) +if(UNIX AND NOT BLENDER_PLATFORM_ARM) set(X264_CONFIGURE_ENV ${CONFIGURE_ENV} && export AS=${LIBDIR}/nasm/bin/nasm )