Don't build universal binaries by default (keystone-engine#366)

* Don't build universal binaries by default

Starting Xcode 10 beta, there's no support for i386.
This commit changes the default build on iOS to regular libraries
instead of universal binaries.
Build of universal binaries is still supported with macos-universal.

* Add macos-no-universal option (compatibility)

Keep the default to be macos-no-universal, but add it as an option as
well for backward compatibility.

Author: BinyaminSharet

make-common.sh

@@ -1,7 +1,7 @@
 BUILDTYPE='Release'
 
-# on MacOS, build universal binaries by default
-ARCH='i386;x86_64'
+# on MacOS, do not build universal binaries by default
+ARCH=''
 
 # by default we do NOT build 32bit on 64bit system
 LLVM_BUILD_32_BITS=0
@@ -24,6 +24,9 @@ while [ "$1" != "" ]; do
     macos-no-universal)
       ARCH=''	# do not build MacOS universal binaries
       ;;
+    macos-universal)
+      ARCH='i386;x86_64'	# build MacOS universal binaries
+      ;;
     *)
       echo "ERROR: unknown parameter \"$1\""
       usage

make-lib.sh

@@ -1,15 +1,16 @@
 #!/bin/sh -e
 
 # Build static library of Keystone Engine
-# syntax: make-lib.sh [debug] [macos-no-universal] [lib32] [lib_only]
+# syntax: make-lib.sh [debug] [macos-universal|macos-no-universal] [lib32] [lib_only]
 
 usage()
 {
   echo ""
   echo "Syntax:  make-lib.sh [debug] [macos-universal] [lib64]"
   echo ""
   echo "         debug: build with debug info"
-  echo "         macos-no-universal: do not build MacOS universal binaries"
+  echo "         macos-universal: build MacOS universal binaries"
+  echo "         macos-no-universal: do not build MacOS universal binaries (default)"
   echo "         lib_only: skip kstool & only build libraries"
   echo "         lib32: build 32bit libraries on 64bit system"
   echo ""

make-share.sh

@@ -1,15 +1,16 @@
 #!/bin/sh -e
 
 # Build shared library of Keystone Engine
-# syntax: make-share.sh [debug] [macos-no-universal] [lib32] [lib_only]
+# syntax: make-share.sh [debug] [macos-universal|macos-no-universal] [lib32] [lib_only]
 
 usage()
 {
   echo ""
   echo "Syntax:  make-share.sh [debug] [macos-universal] [lib64]"
   echo ""
   echo "         debug: build with debug info"
-  echo "         macos-no-universal: do not build MacOS universal binaries"
+  echo "         macos-universal: build MacOS universal binaries"
+  echo "         macos-no-universal: do not build MacOS universal binaries (default)"
   echo "         lib_only: skip kstool & only build libraries"
   echo "         lib32: build 32bit libraries on 64bit system"
   echo ""