Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
8bfcb80d by Steve Lhomme at 2024-10-14T10:49:41+00:00
contrib: x264: only set --cross-prefix once
- - - - -
27d99325 by Steve Lhomme at 2024-10-14T10:49:41+00:00
contrib: x264: fix android aarch64/arm cross prefix
"aarch64" is turned into "ach64 " and "arm" into
"m".
ld is not found in the path to LD:
/sdk/android-ndk/toolchains/llvm/prebuilt/linux-aarch64/bin/aarch64-linux-android-ld
- - - - -
1 changed file:
- contrib/src/x264/rules.mak
Changes:
=====================================
contrib/src/x264/rules.mak
=====================================
@@ -33,10 +33,13 @@ X264CONF += --enable-pic
endif
ifdef HAVE_CROSS_COMPILE
ifndef HAVE_DARWIN_OS
+ifdef HAVE_ANDROID
+X264CONF += --cross-prefix="$(subst ld,,$(LD))"
+else
X264CONF += --cross-prefix="$(HOST)-"
endif
+endif
ifdef HAVE_ANDROID
-X264CONF += --cross-prefix="$(subst ar,,$(AR))"
# broken text relocations
ifeq ($(ANDROID_ABI), x86)
X264CONF += --disable-asm
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/f7537d8835691d28115a6288a5212cc9e26f2d8f...27d993252ccd7548578e0986b30c4e970863397f
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/f7537d8835691d28115a6288a5212cc9e26f2d8f...27d993252ccd7548578e0986b30c4e970863397f
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
