make use of LLVM_LIBDIR_SUFFIX option, and rename 'fhs' to 'lib64'

redd0glee · Jul 19, 2016 · 91719bd · 91719bd
1 parent 02df6d6
commit 91719bd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/llvm/keystone/CMakeLists.txt b/llvm/keystone/CMakeLists.txt
@@ -42,7 +42,7 @@ add_library(keystone
   ks.cpp
 )
 
-install(TARGETS keystone DESTINATION lib)
+install(TARGETS keystone DESTINATION lib${LLVM_LIBDIR_SUFFIX})
 
 set_target_properties(
   keystone

diff --git a/make-common.sh b/make-common.sh
@@ -5,12 +5,12 @@ ARCH='i386;x86_64'
 
 # Linux FHS wants to install x64 libraries in "lib64"
 # Examples are Fedora, Redhat, Suse.
-LIB_SUFFIX=''
+LLVM_LIBDIR_SUFFIX=''
 
 while [ "$1" != "" ]; do
   case $1 in
-    fhs)
-      LIB_SUFFIX='64'
+    lib64)
+      LLVM_LIBDIR_SUFFIX='64'
       ;;
     debug)
       BUILDTYPE='Debug'

diff --git a/make-lib.sh b/make-lib.sh
@@ -1,20 +1,21 @@
 #!/bin/sh -e
 
 # Build static library of Keystone Engine
-# syntax: make-lib.sh [debug] [macos-universal] [fhs]
+# syntax: make-lib.sh [debug] [macos-universal] [lib64]
 
 usage()
 {
   echo ""
-  echo "Syntax:\tmake-lib.sh [debug] [macos-universal] [fhs]\n"
-  echo "\tdebug:           build with debug info"
-  echo "\tmacos-no-universal: do not build MacOS universal binaries"
-  echo "\tfhs: install Linux x64 libraries in \$PREFIX/lib64"
+  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 "         lib64: install Linux x64 libraries in \$PREFIX/lib64"
   echo ""
 }
 
 source "$(dirname "$0")"/make-common.sh
 
-cmake -DLLVM_LIBDIR_SUFFIX="$LIB_SUFFIX" -DCMAKE_OSX_ARCHITECTURES="$ARCH" -DCMAKE_BUILD_TYPE=$BUILDTYPE -DBUILD_SHARED_LIBS=OFF -DLLVM_TARGETS_TO_BUILD="all" -G "Unix Makefiles" ..
+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" ..
 
 time make -j8
diff --git a/make-share.sh b/make-share.sh
@@ -1,20 +1,21 @@
 #!/bin/sh -e
 
 # Build shared library of Keystone Engine
-# syntax: make-share.sh [debug] [macos-universal] [fhs]
+# syntax: make-share.sh [debug] [macos-universal] [lib64]
 
 usage()
 {
   echo ""
-  echo "Syntax:\tmake-share.sh [debug] [macos-universal] [fhs]\n"
-  echo "\tdebug:           build with debug info"
-  echo "\tmacos-no-universal: do not build MacOS universal binaries"
-  echo "\tfhs: install Linux x64 libraries in \$PREFIX/lib64 (Fedora/Redhat/Suse, etc)"
+  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 "         lib64: install Linux x64 libraries in \$PREFIX/lib64 (Fedora/Redhat/Suse, etc)"
   echo ""
 }
 
 source "$(dirname "$0")"/make-common.sh
 
-cmake -DLLVM_LIBDIR_SUFFIX="$LIB_SUFFIX" -DCMAKE_OSX_ARCHITECTURES="$ARCH" -DCMAKE_BUILD_TYPE=$BUILDTYPE -DBUILD_SHARED_LIBS=ON -DLLVM_TARGETS_TO_BUILD="all" -G "Unix Makefiles" ..
+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" ..
 
 time make -j8