IMPALA-3507: Use toolchain linker only if using gold This is a workaround for extremely slow linking when not using gold.
Change-Id: I822a78642993e95abc279944f454fdf67dd8e1d5 Reviewed-on: http://gerrit.cloudera.org:8080/3014 Reviewed-by: Jim Apple <[email protected]> Reviewed-by: Tim Armstrong <[email protected]> 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/18f8f46b Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/18f8f46b Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/18f8f46b Branch: refs/heads/master Commit: 18f8f46be2b06d0bf93f9493853dd688bd1e2158 Parents: 3092c96 Author: Jim Apple <[email protected]> Authored: Tue May 10 08:00:53 2016 -0700 Committer: Tim Armstrong <[email protected]> Committed: Thu May 12 14:18:01 2016 -0700 ---------------------------------------------------------------------- be/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18f8f46b/be/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt index 0b49e32..8ebdf63 100644 --- a/be/CMakeLists.txt +++ b/be/CMakeLists.txt @@ -43,12 +43,11 @@ SET(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-deprecated -Wno-vla") SET(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG") IF($ENV{USE_GOLD_LINKER} STREQUAL "true") SET(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wl,-fuse-ld=gold") + if (IMPALA_TOOLCHAIN) + SET(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -B $ENV{IMPALA_TOOLCHAIN}/binutils-$ENV{IMPALA_BINUTILS_VERSION}/bin/") + endif() ENDIF() -if (IMPALA_TOOLCHAIN) - SET(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -B $ENV{IMPALA_TOOLCHAIN}/binutils-$ENV{IMPALA_BINUTILS_VERSION}/bin/") -endif() - # On Apple we build with clang and need libstdc++ instead of libc++ if (APPLE) SET(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -stdlib=libstdc++")
