You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2016/05/13 06:09:40 UTC
[09/10] incubator-impala git commit: IMPALA-3534: allow overriding of
CMAKE_CXX_COMPILER for ASAN
IMPALA-3534: allow overriding of CMAKE_CXX_COMPILER for ASAN
This makes it consistent with the regular toolchain and makes it easier
to use wrapper scripts like distcc.
Change-Id: I3ab488182c46f9ccb1850a0a2b064653e7e3da26
Reviewed-on: http://gerrit.cloudera.org:8080/3050
Reviewed-by: Jim Apple <jb...@cloudera.com>
Reviewed-by: Casey Ching <ca...@cloudera.com>
Tested-by: Internal 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/2b61ae7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/2b61ae7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/2b61ae7f
Branch: refs/heads/master
Commit: 2b61ae7f2a31cdddc73d2a8eb5a6fc3d3272c2b2
Parents: e96b463
Author: Tim Armstrong <ta...@cloudera.com>
Authored: Thu May 12 13:51:03 2016 -0700
Committer: Tim Armstrong <ta...@cloudera.com>
Committed: Thu May 12 23:06:36 2016 -0700
----------------------------------------------------------------------
cmake_modules/asan_toolchain.cmake | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/2b61ae7f/cmake_modules/asan_toolchain.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/asan_toolchain.cmake b/cmake_modules/asan_toolchain.cmake
index bdc6297..05997bf 100644
--- a/cmake_modules/asan_toolchain.cmake
+++ b/cmake_modules/asan_toolchain.cmake
@@ -24,7 +24,13 @@ set(GCC_ROOT $ENV{IMPALA_TOOLCHAIN}/gcc-$ENV{IMPALA_GCC_VERSION})
set(LLVM_ASAN_ROOT $ENV{IMPALA_TOOLCHAIN}/llvm-$ENV{IMPALA_LLVM_ASAN_VERSION})
set(CMAKE_C_COMPILER ${LLVM_ASAN_ROOT}/bin/clang)
-set(CMAKE_CXX_COMPILER ${LLVM_ASAN_ROOT}/bin/clang++)
+
+# Use clang to build unless overridden by environment.
+if($ENV{IMPALA_CXX_COMPILER} STREQUAL "default")
+ set(CMAKE_CXX_COMPILER ${LLVM_ASAN_ROOT}/bin/clang++)
+else()
+ set(CMAKE_CXX_COMPILER $ENV{IMPALA_CXX_COMPILER})
+endif()
# Add the GCC root location to the compiler flags
set(CXX_COMMON_FLAGS "--gcc-toolchain=${GCC_ROOT}")