Skip to content

Commit

Permalink
macosx: use correct variable names for actual arch
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ePirat authored and jbkempf committed Jan 30, 2025
1 parent e8e46b0 commit b202da7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions extras/package/macosx/env.build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b202da7

Please sign in to comment.