You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by wd...@apache.org on 2018/10/08 15:47:23 UTC
[2/2] kudu git commit: [mac] Add support for XCode 10
[mac] Add support for XCode 10
Change-Id: I442a1cd4605858b0800fc7d7686817936efd155e
Reviewed-on: http://gerrit.cloudera.org:8080/11602
Reviewed-by: Alexey Serbin <as...@cloudera.com>
Tested-by: Kudu Jenkins
Reviewed-by: Attila Bukor <ab...@apache.org>
Tested-by: Attila Bukor <ab...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/2d6f8ffa
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/2d6f8ffa
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/2d6f8ffa
Branch: refs/heads/master
Commit: 2d6f8ffa9d14aacb0096d9d62fe4f5d71741fb4f
Parents: 88229a5
Author: Will Berkeley <wd...@gmail.org>
Authored: Fri Oct 5 16:20:07 2018 -0700
Committer: Will Berkeley <wd...@gmail.com>
Committed: Mon Oct 8 15:46:28 2018 +0000
----------------------------------------------------------------------
cmake_modules/CompilerInfo.cmake | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/2d6f8ffa/cmake_modules/CompilerInfo.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/CompilerInfo.cmake b/cmake_modules/CompilerInfo.cmake
index ff5f789..8422e99 100644
--- a/cmake_modules/CompilerInfo.cmake
+++ b/cmake_modules/CompilerInfo.cmake
@@ -55,6 +55,15 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-9")
set(COMPILER_FAMILY "clang")
set(COMPILER_VERSION "4.0.0svn")
+# clang on macOS, XCode 10.
+#
+# TODO(wdberkeley): 6.0.0svn is also just a guess, for the same reason, and
+# generated from the same sources, particularly the comment
+# https://gist.github.com/yamaya/2924292#gistcomment-801888.
+elseif("${COMPILER_VERSION_FULL}" MATCHES ".*clang-10")
+ set(COMPILER_FAMILY "clang")
+ set(COMPILER_VERSION "6.0.0svn")
+
# gcc
elseif("${COMPILER_VERSION_FULL}" MATCHES ".*gcc version.*")
set(COMPILER_FAMILY "gcc")
@@ -63,6 +72,7 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*gcc version.*")
else()
message(FATAL_ERROR "Unknown compiler. Version info:\n${COMPILER_VERSION_FULL}")
endif()
+
message("Selected compiler ${COMPILER_FAMILY} ${COMPILER_VERSION}")
# gcc (and some varieties of clang) mention the path prefix where system headers