Commit f213a460 authored by Zhiru Zhu's avatar Zhiru Zhu
Browse files

update build.sh and cmake arrow


Former-commit-id: 390f79c35ae01ac28f35582d7e0289f7e759170b
parent 03d0c315
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -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
+4 −6
Original line number Diff line number Diff line
@@ -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}"
                )