make.sh: add 2 new options lib_only & lib32

CMakeLists.txt

@@ -44,8 +44,10 @@ if (NOT BUILD_SHARED_LIBS)
     add_subdirectory(kstool)
 endif()
 else()
+if (NOT BUILD_LIBS_ONLY)
     add_subdirectory(kstool)
 endif()
+endif()
 
 # generate and install pkg-config.pc
 FIND_PACKAGE(PkgConfig)

make-common.sh

@@ -7,8 +7,21 @@ ARCH='i386;x86_64'
 # Examples are Fedora, Redhat, Suse.
 LLVM_LIBDIR_SUFFIX=''
 
+# by default we do NOT build 32bit on 64bit system
+LLVM_BUILD_32_BITS=0
+
+# by default we build libraries & kstool
+# but we can skip kstool & build libraries only
+BUILD_LIBS_ONLY=0
+
 while [ "$1" != "" ]; do
   case $1 in
+    lib_only)
+      BUILD_LIBS_ONLY=1
+      ;;
+    lib32)
+      LLVM_BUILD_32_BITS=1
+      ;;
     lib64)
       LLVM_LIBDIR_SUFFIX='64'
       ;;

make-lib.sh

 #!/bin/sh -e
 
 # Build static library of Keystone Engine
-# syntax: make-lib.sh [debug] [macos-universal] [lib64]
+# syntax: make-lib.sh [debug] [macos-no-universal] [lib32] [lib64] [lib_only]
 
 usage()
 {
@@ -10,12 +10,14 @@ usage()
   echo ""
   echo "         debug: build with debug info"
   echo "         macos-no-universal: do not build MacOS universal binaries"
-  echo "         lib64: install Linux x64 libraries in \$PREFIX/lib64"
+  echo "         lib_only: skip kstool & only build libraries"
+  echo "         lib32: build 32bit libraries on 64bit system"
+  echo "         lib64: install Linux x64 libraries in \$PREFIX/lib64 (Fedora/Redhat/Suse, etc)"
   echo ""
 }
 
 . "$(dirname "$0")"/make-common.sh
 
-cmake -DLLVM_LIBDIR_SUFFIX="$LLVM_LIBDIR_SUFFIX" -DCMAKE_OSX_ARCHITECTURES="$ARCH" -DCMAKE_BUILD_TYPE=$BUILDTYPE -DBUILD_SHARED_LIBS=OFF -DLLVM_TARGETS_TO_BUILD="all" -G "Unix Makefiles" ..
+cmake -DBUILD_LIBS_ONLY=$BUILD_LIBS_ONLY -DLLVM_BUILD_32_BITS="$LLVM_BUILD_32_BITS" -DLLVM_LIBDIR_SUFFIX="$LLVM_LIBDIR_SUFFIX" -DCMAKE_OSX_ARCHITECTURES="$ARCH" -DCMAKE_BUILD_TYPE=$BUILDTYPE -DBUILD_SHARED_LIBS=OFF -DLLVM_TARGETS_TO_BUILD="all" -G "Unix Makefiles" ..
 
 time make -j8

make-share.sh

 #!/bin/sh -e
 
 # Build shared library of Keystone Engine
-# syntax: make-share.sh [debug] [macos-universal] [lib64]
+# syntax: make-share.sh [debug] [macos-no-universal] [lib32] [lib64] [lib_only]
 
 usage()
 {
@@ -10,12 +10,14 @@ usage()
   echo ""
   echo "         debug: build with debug info"
   echo "         macos-no-universal: do not build MacOS universal binaries"
+  echo "         lib_only: skip kstool & only build libraries"
+  echo "         lib32: build 32bit libraries on 64bit system"
   echo "         lib64: install Linux x64 libraries in \$PREFIX/lib64 (Fedora/Redhat/Suse, etc)"
   echo ""
 }
 
 . "$(dirname "$0")"/make-common.sh
 
-cmake -DLLVM_LIBDIR_SUFFIX="$LLVM_LIBDIR_SUFFIX" -DCMAKE_OSX_ARCHITECTURES="$ARCH" -DCMAKE_BUILD_TYPE=$BUILDTYPE -DBUILD_SHARED_LIBS=ON -DLLVM_TARGETS_TO_BUILD="all" -G "Unix Makefiles" ..
+cmake -DBUILD_LIBS_ONLY=$BUILD_LIBS_ONLY -DLLVM_BUILD_32_BITS="$LLVM_BUILD_32_BITS" -DLLVM_LIBDIR_SUFFIX="$LLVM_LIBDIR_SUFFIX" -DCMAKE_OSX_ARCHITECTURES="$ARCH" -DCMAKE_BUILD_TYPE=$BUILDTYPE -DBUILD_SHARED_LIBS=ON -DLLVM_TARGETS_TO_BUILD="all" -G "Unix Makefiles" ..
 
 time make -j8