You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by gr...@apache.org on 2021/03/18 19:25:06 UTC

[kudu] branch master updated: [thirdparty] Remove unnecessary clang usage for libcxxabi

This is an automated email from the ASF dual-hosted git repository.

granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new c4e30bf  [thirdparty] Remove unnecessary clang usage for libcxxabi
c4e30bf is described below

commit c4e30bfe4d67e7cc8b6b29abdc5ffb1f3143336d
Author: Grant Henke <gr...@apache.org>
AuthorDate: Thu Mar 18 12:23:30 2021 -0500

    [thirdparty] Remove unnecessary clang usage for libcxxabi
    
    This patch removes the explicit usage of clang when compiling
    libcxxabi which was done in 458e6ce to handle the lack of gcc5+
    on all supported platforms. We now require gcc7+ as of e432e63.
    
    Change-Id: I36a507d455a555cf71f100f54b41cfaba9da3a27
    Reviewed-on: http://gerrit.cloudera.org:8080/17203
    Reviewed-by: Alexey Serbin <as...@cloudera.com>
    Tested-by: Grant Henke <gr...@apache.org>
---
 thirdparty/build-definitions.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
index fab73d8..2159e7b 100644
--- a/thirdparty/build-definitions.sh
+++ b/thirdparty/build-definitions.sh
@@ -114,9 +114,7 @@ build_libcxxabi() {
   pushd $LIBCXXABI_BDIR
   rm -Rf CMakeCache.txt CMakeFiles/
 
-  # libcxxabi requires gcc5 or newer. Since we can't guarantee that universally,
-  # let's always build it with clang.
-  CC="$CLANG" CXX="$CLANGXX" cmake \
+  cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=$PREFIX \
     -DCMAKE_CXX_FLAGS="$EXTRA_CXXFLAGS $EXTRA_LDFLAGS" \
@@ -146,9 +144,7 @@ build_libcxx() {
   mkdir -p $LIBCXX_BDIR
   pushd $LIBCXX_BDIR
   rm -Rf CMakeCache.txt CMakeFiles/
-  # Since libcxxabi requires gcc5 or newer, we build it with clang. As libcxx is
-  # a dependency, let's also always use clang to build it.
-  CC="$CLANG" CXX="$CLANGXX" cmake \
+  cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=$PREFIX \
     -DCMAKE_CXX_FLAGS="$EXTRA_CXXFLAGS" \