From 1c5740122e70d66eb12f7fecf47f56be7c8d9a75 Mon Sep 17 00:00:00 2001
From: Zhiru Zhu <zhiru.zhu@zilliz.com>
Date: Mon, 21 Oct 2019 19:21:42 +0800
Subject: [PATCH 1/2] update build.sh and cmake arrow

Former-commit-id: 041fd0d581abb3f338c4137e315eff59a829de1f
---
 core/build.sh                                     |  7 +++----
 core/src/index/cmake/ThirdPartyPackagesCore.cmake | 10 ++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/build.sh b/core/build.sh
index cd6f65201b..a662fe497a 100755
--- a/core/build.sh
+++ b/core/build.sh
@@ -93,7 +93,7 @@ cd ${BUILD_OUTPUT_DIR}
 
 # remove make cache since build.sh -l use default variables
 # force update the variables each time
-make rebuild_cache
+make rebuild_cache > /dev/null 2>&1
 
 CMAKE_CMD="cmake \
 -DBUILD_UNIT_TEST=${BUILD_UNITTEST} \
@@ -139,13 +139,12 @@ if [[ ${RUN_CPPLINT} == "ON" ]]; then
 #    fi
 #    echo "clang-tidy check passed!"
 else
-    # compile and build
-    make -j 4 || exit 1
 
     # strip binary symbol
     if [[ ${BUILD_TYPE} != "Debug" ]]; then
         strip src/milvus_server
     fi
 
-    make install || exit 1
+    # compile and build
+    make -j 8 install || exit 1
 fi
\ No newline at end of file
diff --git a/core/src/index/cmake/ThirdPartyPackagesCore.cmake b/core/src/index/cmake/ThirdPartyPackagesCore.cmake
index 99f52dc284..7e9bb0b671 100644
--- a/core/src/index/cmake/ThirdPartyPackagesCore.cmake
+++ b/core/src/index/cmake/ThirdPartyPackagesCore.cmake
@@ -331,10 +331,9 @@ macro(build_arrow)
                         CMAKE_ARGS
                         ${ARROW_CMAKE_ARGS}
                         BUILD_COMMAND
-                        ${MAKE}
-                        ${MAKE_BUILD_ARGS}
+                        ""
                         INSTALL_COMMAND
-                        ${MAKE} install
+                        ${MAKE} ${MAKE_BUILD_ARGS} install
                         BUILD_BYPRODUCTS
                         "${ARROW_STATIC_LIB}"
                         )
@@ -365,10 +364,9 @@ macro(build_arrow)
                 CMAKE_ARGS
                 ${ARROW_CMAKE_ARGS}
                 BUILD_COMMAND
-                ${MAKE}
-                ${MAKE_BUILD_ARGS}
+                ""
                 INSTALL_COMMAND
-                ${MAKE} install
+                ${MAKE} ${MAKE_BUILD_ARGS} install
                 BUILD_BYPRODUCTS
                 "${ARROW_STATIC_LIB}"
                 )

From acc9c83f668c6f3f44831a5bb2cd454f250ce069 Mon Sep 17 00:00:00 2001
From: Zhiru Zhu <zhiru.zhu@zilliz.com>
Date: Mon, 21 Oct 2019 19:35:07 +0800
Subject: [PATCH 2/2] update CHANGELOG

Former-commit-id: ca6d458844d2140772c04ff08b9e575bf0a016f4
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 647a605206..a25db56645 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-648 - Improve unittest
 - MS-655 - Upgrade SPTAG
 - \#42 - Put union of index_build_device and search resources to gpu_pool
+- \#67 - Avoid linking targets multiple times in cmake
 
 ## Feature
 - MS-614 - Preload table at startup