Merge remote-tracking branch 'origin/5.4.0' into 5.4

Change-Id: I95f235a66ce2e9b1fa435c0f911c6f7e811755f0

1 files changed, 7 insertions, 3 deletions

diff --git a/mkspecs/macx-ios-clang/rename_main.sh b/mkspecs/macx-ios-clang/rename_main.sh
index b1321e855e..040140b7ee 100755
--- a/mkspecs/macx-ios-clang/rename_main.sh
+++ b/mkspecs/macx-ios-clang/rename_main.sh
@@ -41,10 +41,14 @@
 ##
 #############################################################################
 
-if [ $# -eq 0 ]; then
-    echo "usage: $0 <path to object files>"
+if [ $# -ne 2 ]; then
+    echo "$0: wrong number of arguments for internal tool used by iOS mkspec"
 else
-    for f in $(find $1 -name '*.o'); do
+    arch_paths=""
+    for a in $2; do
+        arch_paths="$arch_paths $1/$a"
+    done
+    for f in $(find $arch_paths -name '*.o'); do
         # Skip object files without the _main symbol
         nm $f 2>/dev/null | grep -q 'T _main$' || continue