From ecf0efa7be491e3b0a1e966f20ca3a3e88c8597d Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 9 Apr 2018 12:42:16 -0700 Subject: [PATCH] tools: Allow a branch argument to buildrocks script. --- tools/buildrocks.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/buildrocks.sh b/tools/buildrocks.sh index 348c77f22..a7d03fa46 100755 --- a/tools/buildrocks.sh +++ b/tools/buildrocks.sh @@ -5,7 +5,12 @@ if [ -z $LINKAGE ]; then LINKAGE="shared_lib" fi -JOBS=$2 +BRANCH=$2 +if [ -z $BRANCH ]; then + BRANCH="master" +fi + +JOBS=$3 if [ -z $JOBS ]; then JOBS=4 fi @@ -47,6 +52,6 @@ USERDIR=$PWD # Save current dir and return to it later run git submodule update --init deps/rocksdb run cd deps/rocksdb -run git checkout v5.5.3 +run git checkout $BRANCH CFLAGS=-fPIC run make -j$JOBS $LINKAGE run cd $USERDIR # Return to user's original directory