[vlc-commits] [Git][videolan/vlc][master] macosx: use correct variable names for actual arch

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
b202da71 by Marvin Scholz at 2025-01-30T22:15:14+00:00
macosx: use correct variable names for actual arch

This is used in other places in the script and if unset leads to the
`-arch` argument being passed without any architecture, which is invalid
and causes compiler invocations to fail.

The reason this worked in CI is that the build script overwrites the
ACTUAL_HOST_ARCH as it can be changed by an argument. However the
env.build.sh script is used also outside the build.sh script in
manual build scenarios, which is the whole reason it is a separate
script to begin with.

- - - - -


1 changed file:

- extras/package/macosx/env.build.sh


Changes:

=====================================
extras/package/macosx/env.build.sh
=====================================
@@ -19,10 +19,10 @@ get_buildsystem_arch() {
     fi
 }
 
-HOST_ARCH=`uname -m | cut -d. -f1`
-HOST_ARCH=`get_buildsystem_arch $HOST_ARCH`
-BUILD_ARCH=`uname -m | cut -d. -f1`
-BUILD_ARCH=`get_buildsystem_arch $BUILD_ARCH`
+ACTUAL_HOST_ARCH=`uname -m | cut -d. -f1`
+HOST_ARCH=`get_buildsystem_arch $ACTUAL_HOST_ARCH`
+ACTUAL_BUILD_ARCH=`uname -m | cut -d. -f1`
+BUILD_ARCH=`get_buildsystem_arch $ACTUAL_BUILD_ARCH`
 
 vlcGetOSXKernelVersion() {
     local OSX_KERNELVERSION=$(uname -r | cut -d. -f1)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b202da71c8ca0173c6d040bc567c6118cfafe65c

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b202da71c8ca0173c6d040bc567c6118cfafe65c
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance