Skip to content
Snippets Groups Projects
Commit b202da71 authored by Marvin Scholz's avatar Marvin Scholz Committed by Jean-Baptiste Kempf
Browse files

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.
parent e8e46b0d
No related branches found
No related tags found
No related merge requests found
...@@ -19,10 +19,10 @@ get_buildsystem_arch() { ...@@ -19,10 +19,10 @@ get_buildsystem_arch() {
fi fi
} }
HOST_ARCH=`uname -m | cut -d. -f1` ACTUAL_HOST_ARCH=`uname -m | cut -d. -f1`
HOST_ARCH=`get_buildsystem_arch $HOST_ARCH` HOST_ARCH=`get_buildsystem_arch $ACTUAL_HOST_ARCH`
BUILD_ARCH=`uname -m | cut -d. -f1` ACTUAL_BUILD_ARCH=`uname -m | cut -d. -f1`
BUILD_ARCH=`get_buildsystem_arch $BUILD_ARCH` BUILD_ARCH=`get_buildsystem_arch $ACTUAL_BUILD_ARCH`
vlcGetOSXKernelVersion() { vlcGetOSXKernelVersion() {
local OSX_KERNELVERSION=$(uname -r | cut -d. -f1) local OSX_KERNELVERSION=$(uname -r | cut -d. -f1)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment