From a22457b81745eafc4a1e663c6d724859e31da322 Mon Sep 17 00:00:00 2001
From: Mickey Rose <mickey.rose@seznam.cz>
Date: Sat, 17 Aug 2019 18:49:36 +0200
Subject: [PATCH] mason_build: fix creating universal binary

---
 mason.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mason.sh b/mason.sh
index a40359572..683b66a0a 100644
--- a/mason.sh
+++ b/mason.sh
@@ -442,7 +442,7 @@ function mason_build {
 
         SIMULATOR_TARGETS="i386 x86_64"
         DEVICE_TARGETS="armv7 arm64"
-        LIB_FOLDERS=
+        local LIB_FOLDERS=
 
         for ARCH in ${SIMULATOR_TARGETS} ; do
             mason_substep "Building for iOS Simulator ${ARCH}..."
@@ -453,7 +453,7 @@ function mason_build {
             cd "${MASON_PREFIX}"
             mv lib "lib-isim-${ARCH}"
             for i in lib-isim-${ARCH}/*.a ; do lipo -info "$i" ; done
-            LIB_FOLDERS="${LIB_FOLDERS} lib-isim-${ARCH}"
+            LIB_FOLDERS+=" lib-isim-${ARCH}"
         done
 
         for ARCH in ${DEVICE_TARGETS} ; do
@@ -465,20 +465,20 @@ function mason_build {
             cd "${MASON_PREFIX}"
             mv lib lib-ios-${ARCH}
             for i in lib-ios-${ARCH}/*.a ; do lipo -info $i ; done
-            LIB_FOLDERS="${LIB_FOLDERS} lib-ios-${ARCH}"
+            LIB_FOLDERS+=" lib-ios-${ARCH}"
         done
 
         # Create universal binary
         mason_substep "Creating Universal Binary..."
         cd "${MASON_PREFIX}"
         mkdir -p lib
-        for LIB in $(find ${LIB_FOLDERS} -name "*.a" | xargs basename | sort | uniq) ; do
-            lipo -create $(find ${LIB_FOLDERS} -name "${LIB}") -output lib/${LIB}
+        for LIB in $(find ${LIB_FOLDERS} -name "*.a" | sed 's:.*/::' | sort -u); do
+            lipo -create $(find ${LIB_FOLDERS} -name ${LIB}) -output lib/${LIB}
             lipo -info "lib/${LIB}"
         done
 
         cd "${MASON_PREFIX}"
-        rm -rf "${LIB_FOLDERS}"
+        rm -rf -- ${LIB_FOLDERS}
     elif [ ${MASON_PLATFORM} = 'android' ]; then
         cd "${MASON_BUILD_PATH}"
         mason_compile