Repository: kudu Updated Branches: refs/heads/master 7db4d82f4 -> 2de096ccb
build-and-test.sh: don't rebuild thirdparty There's no reason NOT to pass NO_REBUILD_THIRDPARTY=1 to the Kudu cmake invocation; we're guaranteed to have built the thirdparty tree just before. Change-Id: Icba28146b44401499379d7c1f69742578456a448 Reviewed-on: http://gerrit.cloudera.org:8080/11542 Reviewed-by: Hao Hao <[email protected]> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/2de096cc Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/2de096cc Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/2de096cc Branch: refs/heads/master Commit: 2de096ccbb245d801a1fd179cdcc1fc6c832bedd Parents: 7db4d82 Author: Adar Dembo <[email protected]> Authored: Fri Sep 28 11:47:41 2018 -0700 Committer: Adar Dembo <[email protected]> Committed: Fri Sep 28 23:54:05 2018 +0000 ---------------------------------------------------------------------- build-support/jenkins/build-and-test.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/2de096cc/build-support/jenkins/build-and-test.sh ---------------------------------------------------------------------- diff --git a/build-support/jenkins/build-and-test.sh b/build-support/jenkins/build-and-test.sh index 312ff65..df0336c 100755 --- a/build-support/jenkins/build-and-test.sh +++ b/build-support/jenkins/build-and-test.sh @@ -225,12 +225,20 @@ else CMAKE_BUILD=$BUILD_TYPE fi -# Assemble the cmake command line. -CMAKE= +# Assemble the cmake command line, starting with environment variables. + +# There's absolutely no reason to rebuild the thirdparty tree; we just ran +# build-if-necessary.sh above. +CMAKE="env NO_REBUILD_THIRDPARTY=1" + +# If using clang, we have to change the compiler via environment variables. if [ -n "$USE_CLANG" ]; then - CMAKE="env CC=$CLANG CXX=$CLANG++" + CMAKE="$CMAKE CC=$CLANG CXX=$CLANG++" fi + +# This will be a passthrough for systems without devtoolset. CMAKE="$CMAKE $SOURCE_ROOT/build-support/enable_devtoolset.sh" + CMAKE="$CMAKE $THIRDPARTY_BIN/cmake" CMAKE="$CMAKE -DCMAKE_BUILD_TYPE=$CMAKE_BUILD"
