chaoyli closed pull request #331: Fix a compile issue
URL: https://github.com/apache/incubator-doris/pull/331
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/build.sh b/build.sh
index 9bc01e11..da44d1bb 100755
--- a/build.sh
+++ b/build.sh
@@ -35,7 +35,7 @@ export DORIS_HOME=${ROOT}
. ${DORIS_HOME}/env.sh
-PARALLEL=8
+PARALLEL=$[$(nproc)/4+1]
# Check args
usage() {
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index df744b0b..ce56e5ac 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -397,7 +397,6 @@ build_boost() {
check_if_source_exist $BOOST_SOURCE
cd $TP_SOURCE_DIR/$BOOST_SOURCE
- echo "using gcc : $GCC_VERSION : $CXX ; " > tools/build/src/user-config.jam
./bootstrap.sh --prefix=$TP_INSTALL_DIR
./b2 link=static -d0 -j$PARALLEL --without-mpi --without-graph
--without-graph_parallel --without-python cxxflags="-std=c++11 -fPIC
-I$TP_INCLUDE_DIR -L$TP_LIB_DIR" install
}
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index f60a8eb7..d4e7278f 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -22,7 +22,7 @@
############################################################
# --job param for *make*
-PARALLEL=4
+PARALLEL=$[$(nproc)/4+1]
###################################################
# DO NOT change variables bellow unless you known
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
