[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: rust: enable aarch64-apple-darwin

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
452d735a by Steve Lhomme at 2024-07-07T04:50:01+00:00
contrib: rust: enable aarch64-apple-darwin

It may not have been available when adc4d84607fa743b6e48f4888aba7b799788674e was added.
But now it's a Tier 2 target [1]

[1] https://doc.rust-lang.org/nightly/rustc/platform-support/apple-darwin.html

- - - - -
872169c2 by Steve Lhomme at 2024-07-07T04:50:01+00:00
contrib: detect Windows build with UCRT instead of msvcrt

- - - - -
3db7c594 by Steve Lhomme at 2024-07-07T04:50:01+00:00
contrib: rust: use the "llvm" targets when building with UCRT

The naming in Rust is bogus but it does means it's using UCRT [1].

[1] https://doc.rust-lang.org/nightly/rustc/platform-support/pc-windows-gnullvm.html

- - - - -


2 changed files:

- contrib/src/main-rust.mak
- contrib/src/main.mak


Changes:

=====================================
contrib/src/main-rust.mak
=====================================
@@ -4,15 +4,25 @@
 # This file is under the same license as the vlc package.
 
 ifdef HAVE_WIN32
-ifndef HAVE_WINSTORE
+ifdef HAVE_UCRT
+ifndef HAVE_WINSTORE # UWP is available as Tier 3
+ifeq ($(HOST),i686-w64-mingw32)
+RUST_TARGET = i686-pc-windows-gnullvm # ARCH is i386
+else ifeq ($(HOST),x86_64-w64-mingw32)
+RUST_TARGET = $(ARCH)-pc-windows-gnullvm
+else
+# Not supported on armv7/aarch64 yet
+endif # archs
+endif # WINSTORE
+else # MSVCRT
 ifeq ($(HOST),i686-w64-mingw32)
 RUST_TARGET = i686-pc-windows-gnu # ARCH is i386
 else ifeq ($(HOST),x86_64-w64-mingw32)
 RUST_TARGET = $(ARCH)-pc-windows-gnu
 else
 # Not supported on armv7/aarch64 yet
-endif
-endif
+endif # archs
+endif # MSVCRT
 else ifdef HAVE_ANDROID
 RUST_TARGET = $(HOST)
 else ifdef HAVE_IOS
@@ -24,9 +34,7 @@ endif
 endif
 endif
 else ifdef HAVE_MACOSX
-ifneq ($(ARCH),aarch64) # macOS ARM-64 is unsupported
 RUST_TARGET = $(ARCH)-apple-darwin
-endif
 else ifdef HAVE_SOLARIS
 RUST_TARGET = x86_64-sun-solaris
 else ifdef HAVE_LINUX


=====================================
contrib/src/main.mak
=====================================
@@ -218,6 +218,12 @@ BUILDLDFLAGS ?= $(BUILDCFLAGS)
 
 # Do not export variables above! Use HOSTVARS or BUILDVARS.
 
+ifdef HAVE_WIN32
+ifneq ($(call cppcheck, _UCRT),)
+HAVE_UCRT = 1
+endif
+endif
+
 # Do the FPU detection, after we have figured out our compilers and flags.
 ifneq ($(findstring $(ARCH),aarch64 i386 ppc ppc64 ppc64le sparc sparc64 x86_64),)
 # This should be consistent with include/vlc_cpu.h



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d360da6bf8bf2dfceeab0da319d4cd9f070ec4ff...3db7c59452c860cd9c748bf2145407e9407c33a5

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


VideoLAN code repository instance