Fix build

Makefile

@@ -132,8 +132,8 @@ ifeq (${DEBUG_LEVEL},2)
   DBG_OR_RLS=d
 endif
 
-BMI2 ?= $(shell bash cpu_has_bmi2.sh)
-BUILD_NAME := $(shell bash get_terark_build_name.sh ${CXX} ${BMI2})
+BMI2 ?= $(shell bash scripts/cpu_has_bmi2.sh)
+BUILD_NAME := $(shell bash scripts/get_terark_build_name.sh ${CXX} ${BMI2})
 BUILD_ROOT := build/${BUILD_NAME}
 xdir:=${BUILD_ROOT}/dbg-${DEBUG_LEVEL}
 

scripts/get_terark_build_name.sh

@@ -7,13 +7,13 @@ CXX=$1
 set -e
 tmpfile=`mktemp /tmp/compiler-XXXXXX`
 dir=`dirname $0`
-dir=`cd $dir; pwd`
+dir=`cd $dir/..; pwd`
 $CXX $dir/terark-tools/detect-compiler.cpp -o ${tmpfile}.exe
 COMPILER=`${tmpfile}.exe`
 rm -f ${tmpfile}*
 UNAME_MachineSystem=`uname -m -s | sed 's:[ /]:-:g'`
 if [ -z ${WITH_BMI2} ]; then
-	WITH_BMI2=`bash $dir/cpu_has_bmi2.sh`
+	WITH_BMI2=`bash $dir/scripts/cpu_has_bmi2.sh`
 fi
 BUILD_NAME=${UNAME_MachineSystem}-${COMPILER}-bmi2-${WITH_BMI2}
 echo -n $BUILD_NAME

terark-core @ 92111ddd

-Subproject commit 2cef9a92e277dc5a355cc76022d882ab4c1c7b20
+Subproject commit 92111ddd5fc62062671b8702e4640b2c955ba699