Skip to content

Commit

Permalink
[thirdparty] Remove unnecessary clang usage for libcxxabi
Browse files Browse the repository at this point in the history
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 <[email protected]>
Tested-by: Grant Henke <[email protected]>
  • Loading branch information
granthenke committed Mar 18, 2021
1 parent 6f4c534 commit c4e30bf
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions thirdparty/build-definitions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down Expand Up @@ -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" \
Expand Down

0 comments on commit c4e30bf

Please sign in to comment.