[vlc-commits] [Git][videolan/vlc][master] 3 commits: configure: pass the macOS toolchain flags to CCAS

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
1e7dc277 by Steve Lhomme at 2025-10-18T11:11:12+00:00
configure: pass the macOS toolchain flags to CCAS

Otherwise we end up with warnings like this:

> ld: warning: object file (vlc/build/modules/isa/aarch64/simd/.libs/merge.o) was built for newer 'macOS' version (15.0) than being linked (11.0)

- - - - -
47ecb166 by Steve Lhomme at 2025-10-18T11:11:12+00:00
contrib: x264: pass EXTRA_CFLAGS to the CC assembler

Otherwise we end up with warnings like this:

> ld: warning: object file (/Volumes/APFS/Programs/Videolabs/vlc/build/contrib/aarch64-apple-darwin15/lib/libx264.a[63](bitstream-a-8.o)) was built for newer 'macOS' version (15.0) than being linked (11.0)

- - - - -
be11c02c by Steve Lhomme at 2025-10-18T11:11:12+00:00
contrib: x265: pass mmacosx-version-min/isysroot to the CC assembler

Otherwise we end up with warnings like this:

> ld: warning: object file (/vlc/build/contrib/aarch64-apple-darwin15/lib/libx265.a[83](blockcopy8-sve.S.o)) was built for newer 'macOS' version (15.0) than being linked (11.0)

The CXXCOMPILER is not used with x86/x86_64.

- - - - -


3 changed files:

- configure.ac
- contrib/src/x264/rules.mak
- contrib/src/x265/rules.mak


Changes:

=====================================
configure.ac
=====================================
@@ -276,6 +276,7 @@ int foo() { return my_array[0]; }
         CC="${CC} -isysroot ${with_macosx_sdk}"
         CXX="${CXX} -isysroot ${with_macosx_sdk}"
         OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
+        CCAS="${CCAS} -isysroot ${with_macosx_sdk}"
         LD="${LD} -syslibroot ${with_macosx_sdk}"
     fi
     AC_ARG_WITH(macosx-version-min,
@@ -286,6 +287,7 @@ int foo() { return my_array[0]; }
         CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
         CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
         OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
+        CCAS="${CCAS} -mmacosx-version-min=${with_macosx_version_min}"
         LD="${LD} -mmacosx_version_min=${with_macosx_version_min}"
     fi
     ;;


=====================================
contrib/src/x264/rules.mak
=====================================
@@ -47,6 +47,16 @@ endif
 endif
 endif
 
+ifneq ($(filter arm aarch64, $(ARCH)),)
+ifndef HAVE_WIN32
+X264_ASM_USES_CC:=1
+endif
+endif
+
+ifdef X264_ASM_USES_CC
+X264CONF += --extra-asflags="$(EXTRA_CFLAGS)"
+endif
+
 $(TARBALLS)/x264-$(X264_VERSION).tar.xz:
 	$(call download_git,$(X264_GITURL),,$(X264_HASH))
 


=====================================
contrib/src/x265/rules.mak
=====================================
@@ -41,6 +41,16 @@ x265: x265_$(X265_VERSION).tar.gz .sum-x265
 
 X265_CONF := -DENABLE_SHARED=OFF -DENABLE_CLI=OFF
 
+ifdef HAVE_DARWIN_OS
+ifneq ($(filter arm aarch64, $(ARCH)),)
+ifdef HAVE_IOS
+X265_CONF += -DASM_FLAGS="-mmacosx-version-min=$(VLC_DEPLOYMENT_TARGET);-isysroot;$(IOS_SDK)"
+else
+X265_CONF += -DASM_FLAGS="-mmacosx-version-min=$(VLC_DEPLOYMENT_TARGET);-isysroot;$(MACOSX_SDK)"
+endif
+endif
+endif
+
 .x265: x265 toolchain.cmake
 	$(REQUIRE_GPL)
 	$(CMAKECLEAN)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/13d5a00d5301f0150726f290d078fc43bdb2d7e1...be11c02cda1a6c7af8c28a7101f39b6fc5587c38

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/13d5a00d5301f0150726f290d078fc43bdb2d7e1...be11c02cda1a6c7af8c28a7101f39b6fc5587c38
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance