Handle multi-arch builds in Xcode lipo phase (#17212)
Correctly split ARCHS into a Bash array in xcode_backend.sh. Previously, when ARCHS contained multiple values (e.g., ARCHS="armv7 arm64"), we treated that as a single architecture, and lipo invocation would fail.
This commit is contained in:
@@ -184,7 +184,8 @@ GetFrameworkExecutablePath() {
|
||||
LipoExecutable() {
|
||||
local executable="$1"
|
||||
shift
|
||||
local archs=("$@")
|
||||
# Split $@ into an array.
|
||||
read -r -a archs <<< "$@"
|
||||
|
||||
# Extract architecture-specific framework executables.
|
||||
local all_executables=()
|
||||
@@ -225,11 +226,10 @@ LipoExecutable() {
|
||||
ThinFramework() {
|
||||
local framework_dir="$1"
|
||||
shift
|
||||
local archs=("$@")
|
||||
|
||||
local plist_path="${framework_dir}/Info.plist"
|
||||
local executable="$(GetFrameworkExecutablePath "${framework_dir}")"
|
||||
LipoExecutable "${executable}" "${archs[@]}"
|
||||
LipoExecutable "${executable}" "$@"
|
||||
}
|
||||
|
||||
ThinAppFrameworks() {
|
||||
|
||||
Reference in New Issue
Block a user