configure compile method

Makefile

@@ -24,11 +24,6 @@ MACHINE ?= $(shell uname -m)
 ARFLAGS = ${EXTRA_ARFLAGS} rs
 STRIPFLAGS = -S -x
 
-USE_JEMALLOC ?= 0
-ifeq (${USE_JEMALLOC},1)
-	LDFLAGS += -L./third-party/jemalloc/lib -ljemalloc
-endif
-
 CXXFLAGS += -fPIC
 # Transform parallel LOG output into something more readable.
 perl_command = perl -n \
@@ -274,6 +269,10 @@ ifeq ($(TERARKDB_ENABLE_CONSOLE),1)
 OPT += -DTERARKDB_ENABLE_CONSOLE
 endif
 
+ifeq (${USE_JEMALLOC},1)
+	LDFLAGS += -L./third-party/jemalloc/lib -ljemalloc
+endif
+
 #-----------------------------------------------
 include src.mk
 

build.sh

@@ -49,8 +49,10 @@ if test -z "$NO_INIT"; then
   fi
 fi
 
+JEMALLOC=0
 if [ "$USE_JEMALLOC" == "1" ]; then
   cd third-party/jemalloc && bash autogen.sh && ./configure --enable-prof-libunwind && make -j20 && cd ../../
+  JEMALLOC=1
 fi
 
 export BUNDLE_ALL_TERARK_STATIC=${BUNDLE_ALL_TERARK_STATIC:-1}
@@ -60,7 +62,7 @@ make LINK_TERARK=static \
      EXTRA_CXXFLAGS="-DROCKSDB_VALGRIND_RUN=$VALGRIND" \
      BMI2=$WITH_BMI2 \
      DISABLE_WARNING_AS_ERROR=1 \
-     USE_JEMALLOC={$USE_JEMALLOC:=0} \
+     USE_JEMALLOC=$JEMALLOC \
      TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
      TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
      PORTABLE=$PORTABLE \
@@ -70,7 +72,7 @@ make LINK_TERARK=static \
      EXTRA_CXXFLAGS="-DROCKSDB_VALGRIND_RUN=$VALGRIND" \
      BMI2=$WITH_BMI2 \
      DISABLE_WARNING_AS_ERROR=1 \
-     USE_JEMALLOC={$USE_JEMALLOC:=0} \
+     USE_JEMALLOC=$JEMALLOC \
      TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
      TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
      PORTABLE=$PORTABLE \
@@ -80,7 +82,7 @@ make LINK_TERARK=static \
      EXTRA_CXXFLAGS="-DROCKSDB_VALGRIND_RUN=$VALGRIND" \
      BMI2=$WITH_BMI2 \
      DISABLE_WARNING_AS_ERROR=1 \
-     USE_JEMALLOC={$USE_JEMALLOC:=0} \
+     USE_JEMALLOC=$JEMALLOC \
      TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
      TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
      PORTABLE=$PORTABLE \
@@ -91,7 +93,7 @@ make LINK_TERARK=static \
      EXTRA_CXXFLAGS="-DROCKSDB_VALGRIND_RUN=$VALGRIND" \
      BMI2=$WITH_BMI2 \
      DISABLE_WARNING_AS_ERROR=1 \
-     USE_JEMALLOC={$USE_JEMALLOC:=0} \
+     USE_JEMALLOC=$JEMALLOC \
      TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
      TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
      PORTABLE=$PORTABLE \
@@ -101,7 +103,7 @@ make LINK_TERARK=static \
      EXTRA_CXXFLAGS="-DROCKSDB_VALGRIND_RUN=$VALGRIND" \
      BMI2=$WITH_BMI2 \
      DISABLE_WARNING_AS_ERROR=1 \
-     USE_JEMALLOC={$USE_JEMALLOC:=0} \
+     USE_JEMALLOC=$JEMALLOC \
      TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
      TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
      PORTABLE=$PORTABLE \
@@ -111,7 +113,7 @@ make LINK_TERARK=static \
      EXTRA_CXXFLAGS="-DROCKSDB_VALGRIND_RUN=$VALGRIND" \
      BMI2=$WITH_BMI2 \
      DISABLE_WARNING_AS_ERROR=1 \
-     USE_JEMALLOC={$USE_JEMALLOC:=0} \
+     USE_JEMALLOC=$JEMALLOC \
      TERARKDB_ENABLE_METRICS=$TERARKDB_ENABLE_METRICS \
      TERARKDB_ENABLE_CONSOLE=$TERARKDB_ENABLE_CONSOLE \
      PORTABLE=$PORTABLE \