Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits: bf3e0263 by Steve Lhomme at 2026-06-05T10:21:26+00:00 contrib: vpx: pass the AS as environment on non-x86 Android It's not part of the HOSTVAR environment. But it's set in config.mak since [^1]. On x86 target --as is set to auto and will pick yasm/nasm. On other platforms we should use the assembler set in AS. [^1]: https://code.videolan.org/videolan/libvlcjni/-/commit/f8d8c2fcf3e63494b0c9dd16dbf22f39e1962e6c (cherry picked from commit cd901b53f8a705f93a0deb73a21ca6cd34525f95) Signed-off-by: Steve Lhomme <[email protected]> - - - - - 1 changed file: - contrib/src/vpx/rules.mak Changes: ===================================== contrib/src/vpx/rules.mak ===================================== @@ -175,6 +175,12 @@ ifdef HAVE_ANDROID # toolchains, therefore pass the HOSTVARS directly to bypass any detection. ifneq ($(shell $(VPX_CROSS)gcc -v >/dev/null 2>&1 || echo FAIL),) VPX_HOSTVARS = $(HOSTVARS) + +ifeq ($(filter $(ARCH),i386 x86_64),) +# use CCAS for platforms not using nasm/yasm +VPX_HOSTVARS += AS="$(CCAS)" +endif + endif endif View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/bf3e0263b1aa433144a0dcb19949f6b4adabe2f2 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/bf3e0263b1aa433144a0dcb19949f6b4adabe2f2 You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
