kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ale...@apache.org
Subject [1/2] kudu git commit: thirdparty: treat cc the same as gcc when building boost
Date Thu, 26 Oct 2017 20:44:37 GMT
Repository: kudu
Updated Branches:
  refs/heads/master c8603ab77 -> 6097e2d1a


thirdparty: treat cc the same as gcc when building boost

Change-Id: I6c26723b2bcbcba524aad441e39b2d3fbe580079
Reviewed-on: http://gerrit.cloudera.org:8080/8391
Tested-by: Adar Dembo <adar@cloudera.com>
Reviewed-by: Todd Lipcon <todd@apache.org>


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

Branch: refs/heads/master
Commit: 49a7d9712bf367b89946e0b81f5db26a85ef00aa
Parents: c8603ab
Author: Adar Dembo <adar@cloudera.com>
Authored: Wed Oct 25 16:21:43 2017 -0700
Committer: Todd Lipcon <todd@apache.org>
Committed: Thu Oct 26 20:39:40 2017 +0000

----------------------------------------------------------------------
 thirdparty/build-definitions.sh | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/49a7d971/thirdparty/build-definitions.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
index acfdf30..e5b8045 100644
--- a/thirdparty/build-definitions.sh
+++ b/thirdparty/build-definitions.sh
@@ -686,6 +686,12 @@ build_boost() {
     # and clang, even when they're called through ccache.
     local COMPILER=$($CC --version | awk 'NR==1 {print $1;}')
 
+    # If the compiler binary used was 'cc' and not 'gcc', it will also report
+    # itself as 'cc'. Coerce it to gcc.
+    if [ "$COMPILER" = "cc" ]; then
+      COMPILER=gcc
+    fi
+
     TOOLSET="toolset=${COMPILER}"
     echo "Using $TOOLSET"
     echo "using ${COMPILER} : : $CXX ;" > $USER_JAMFILE


Mime
View raw message