IMPALA-4649: add a mechanism to pass flags into make Testing: Tested that buildall.sh works as expected. Built locally with IMPALA_MAKE_FLAGS unset to confirm I didn't break anything.
Built locally with IMPALA_MAKE_FLAGS=--load-average=$IMPALA_BUILD_THREADS and looked at "ps auxf" output to confirm it's passed through. Change-Id: I17b13cbaf395f962762d5cff3d650ffb077934a4 Reviewed-on: http://gerrit.cloudera.org:8080/5480 Reviewed-by: Tim Armstrong <[email protected]> Tested-by: Impala Public Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/44ae9fce Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/44ae9fce Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/44ae9fce Branch: refs/heads/master Commit: 44ae9fceadb296bc386e91711e02866ad1411e88 Parents: 2eef39d Author: Tim Armstrong <[email protected]> Authored: Mon Dec 12 10:38:11 2016 -0800 Committer: Impala Public Jenkins <[email protected]> Committed: Thu Dec 15 21:37:17 2016 +0000 ---------------------------------------------------------------------- bin/impala-config.sh | 5 +++++ bin/make_impala.sh | 4 ++-- testdata/bin/copy-udfs-udas.sh | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/44ae9fce/bin/impala-config.sh ---------------------------------------------------------------------- diff --git a/bin/impala-config.sh b/bin/impala-config.sh index 2a0ac83..c68d413 100755 --- a/bin/impala-config.sh +++ b/bin/impala-config.sh @@ -379,9 +379,14 @@ export ASAN_SYMBOLIZER_PATH="${IMPALA_TOOLCHAIN}/llvm-${IMPALA_LLVM_ASAN_VERSION export CLUSTER_DIR="${IMPALA_HOME}/testdata/cluster" +# The number of parallel build processes we should run at a time. : ${IMPALA_BUILD_THREADS:="$(nproc)"} export IMPALA_BUILD_THREADS +# Additional flags to pass to make or ninja. +: ${IMPALA_MAKE_FLAGS:=""} +export IMPALA_MAKE_FLAGS + # Some environments (like the packaging build) might not have $USER set. Fix that here. export USER="${USER-`id -un`}" http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/44ae9fce/bin/make_impala.sh ---------------------------------------------------------------------- diff --git a/bin/make_impala.sh b/bin/make_impala.sh index ec8421a..97525c3 100755 --- a/bin/make_impala.sh +++ b/bin/make_impala.sh @@ -32,7 +32,7 @@ TARGET_BUILD_TYPE=${TARGET_BUILD_TYPE:-""} BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-""} CMAKE_ONLY=0 MAKE_CMD=make -MAKE_ARGS=-j${IMPALA_BUILD_THREADS:-4} +MAKE_ARGS="-j${IMPALA_BUILD_THREADS:-4} ${IMPALA_MAKE_FLAGS}" # The minimal make targets if BUILD_EVERYTHING is 0. MAKE_TARGETS="impalad statestored catalogd fesupport loggingsupport ImpalaUdf" @@ -161,7 +161,7 @@ fi if [ $CLEAN -eq 1 ] then - ${MAKE_CMD} clean + ${MAKE_CMD} ${IMPALA_MAKE_FLAGS} clean fi $IMPALA_HOME/bin/gen_build_version.py http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/44ae9fce/testdata/bin/copy-udfs-udas.sh ---------------------------------------------------------------------- diff --git a/testdata/bin/copy-udfs-udas.sh b/testdata/bin/copy-udfs-udas.sh index 5e5b804..3e1587d 100755 --- a/testdata/bin/copy-udfs-udas.sh +++ b/testdata/bin/copy-udfs-udas.sh @@ -48,7 +48,7 @@ done if [ $BUILD -eq 1 ] then pushd "${IMPALA_HOME}" - "${MAKE_CMD:-make}" "-j${IMPALA_BUILD_THREADS:-4}" \ + "${MAKE_CMD:-make}" ${IMPALA_MAKE_FLAGS} "-j${IMPALA_BUILD_THREADS:-4}" \ TestUdas TestUdfs test-udfs-ir udfsample udasample udf-sample-ir uda-sample-ir cd "${IMPALA_HOME}/tests/test-hive-udfs" "${IMPALA_HOME}/bin/mvn-quiet.sh" package
