kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject [1/3] incubator-kudu git commit: KUDU-1285: use ccache if available in thirdparty builds with clang
Date Sat, 16 Jan 2016 21:31:29 GMT
Repository: incubator-kudu
Updated Branches:
  refs/heads/master 56f97d557 -> 53f976f03


KUDU-1285: use ccache if available in thirdparty builds with clang

Piggy-backing on the work done in commit c8049c1.

Change-Id: I64a78d145ae60b5c99e33734486fbe242c90fb1b
Reviewed-on: http://gerrit.cloudera.org:8080/1810
Tested-by: Internal Jenkins
Reviewed-by: Todd Lipcon <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/2cd52ba6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/2cd52ba6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/2cd52ba6

Branch: refs/heads/master
Commit: 2cd52ba63562d04c76470a43f08ade0afcd625ca
Parents: 56f97d5
Author: Adar Dembo <adar@cloudera.com>
Authored: Fri Jan 15 17:49:56 2016 -0800
Committer: Todd Lipcon <todd@apache.org>
Committed: Sat Jan 16 05:55:15 2016 +0000

----------------------------------------------------------------------
 thirdparty/build-thirdparty.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/2cd52ba6/thirdparty/build-thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index ebff539..a6684a2 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -259,9 +259,15 @@ if [ -n "$F_TSAN" ]; then
   #   * -Wl,-rpath,... - Add instrumented libstdc++ location to the rpath so that
   #                      it can be found at runtime.
 
-  # TODO(KUDU-1285): Fix thirdparty TSAN builds to allow ccache
-  export CC="$TP_DIR/clang-toolchain/bin/clang"
-  export CXX="$TP_DIR/clang-toolchain/bin/clang++"
+  if which ccache >/dev/null ; then
+    CLANG="$TP_DIR/../build-support/ccache-clang/clang"
+    CLANGXX="$TP_DIR/../build-support/ccache-clang/clang++"
+  else
+    CLANG="$TP_DIR/clang-toolchain/bin/clang"
+    CLANGXX="$TP_DIR/clang-toolchain/bin/clang++"
+  fi
+  export CC=$CLANG
+  export CXX=$CLANGXX
 
   PREFIX=$PREFIX_DEPS_TSAN
 
@@ -298,7 +304,7 @@ if [ -n "$F_TSAN" ]; then
   fi
   restore_env
 
-  # Build dependencies that do no require TSAN instrumentation
+  # Build dependencies that do not require TSAN instrumentation
 
   EXTRA_CXXFLAGS="-nostdinc++ $EXTRA_CXXFLAGS"
   EXTRA_CXXFLAGS="-isystem $PREFIX_LIBSTDCXX/include/c++/$GCC_VERSION/backward $EXTRA_CXXFLAGS"


Mime
View raw message