From e6d300a219357f25143bc5ebe1f833668800cd3d Mon Sep 17 00:00:00 2001
From: Francesco Siddi <francesco.siddi@gmail.com>
Date: Fri, 17 Aug 2018 12:16:59 +0200
Subject: [PATCH] Benchmark submodule checkout after libs update

Otherwise on Darwin make update will switch it
back to master.
---
 bundle/bundle.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/bundle/bundle.sh b/bundle/bundle.sh
index 5f44921..a60cb21 100755
--- a/bundle/bundle.sh
+++ b/bundle/bundle.sh
@@ -278,13 +278,6 @@ ${GIT_C} pull
 echo "Updatying submodules to the latest version..."
 ${GIT_C} submodule update --remote --init --recursive
 
-
-# The release/scripts/benchmark submodule should be on the correct branch (usually release-xxx)
-BM_BRANCH=$(${GIT} -C ${SCRIPTPATH} rev-parse --abbrev-ref HEAD)
-echo "Forcing release/scripts/benchmark to $BM_BRANCH branch..."
-${GIT} -C ${SOURCE_DIRECTORY}/release/scripts/benchmark checkout ${BM_BRANCH}
-
-
 if [ "${KERNEL_NAME}" == "Darwin" ]; then
   # Get precompiled libs
   cd "${SOURCE_DIRECTORY}"
@@ -303,6 +296,11 @@ elif [[ "${KERNEL_NAME}" == "MINGW"* ]]; then
   EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -H${SOURCE_DIRECTORY} -B${BUILD_DIRECTORY}"
 fi
 
+# The release/scripts/benchmark submodule should be on the correct branch (usually release-xxx)
+BM_BRANCH=$(${GIT} -C ${SCRIPTPATH} rev-parse --abbrev-ref HEAD)
+echo "Forcing release/scripts/benchmark to $BM_BRANCH branch..."
+${GIT} -C ${SOURCE_DIRECTORY}/release/scripts/benchmark checkout ${BM_BRANCH}
+
 mkdir -p "${BUILD_DIRECTORY}"
 cd "${BUILD_DIRECTORY}"
 "${CMAKE}" \