You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2016/03/31 19:03:05 UTC
arrow git commit: ARROW-93: Fix builds when using XCode 7.3
Repository: arrow
Updated Branches:
refs/heads/master 2d8627cd8 -> 5a68f8d73
ARROW-93: Fix builds when using XCode 7.3
Author: Dan Robinson <da...@gmail.com>
Closes #54 from danrobinson/ARROW-93 and squashes the following commits:
ddff5b0 [Dan Robinson] ARROW-93: Fix builds when using XCode 7.3
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/5a68f8d7
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/5a68f8d7
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/5a68f8d7
Branch: refs/heads/master
Commit: 5a68f8d737aa94ff3d09dae4e5b29883e798e9c4
Parents: 2d8627c
Author: Dan Robinson <da...@gmail.com>
Authored: Thu Mar 31 10:02:54 2016 -0700
Committer: Wes McKinney <we...@apache.org>
Committed: Thu Mar 31 10:02:54 2016 -0700
----------------------------------------------------------------------
cpp/cmake_modules/CompilerInfo.cmake | 2 +-
python/cmake_modules/CompilerInfo.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/5a68f8d7/cpp/cmake_modules/CompilerInfo.cmake
----------------------------------------------------------------------
diff --git a/cpp/cmake_modules/CompilerInfo.cmake b/cpp/cmake_modules/CompilerInfo.cmake
index 0786068..e1c821c 100644
--- a/cpp/cmake_modules/CompilerInfo.cmake
+++ b/cpp/cmake_modules/CompilerInfo.cmake
@@ -31,7 +31,7 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*based on LLVM.*")
# clang on Mac OS X, XCode 7. No version replacement is done
# because Apple no longer advertises the upstream LLVM version.
-elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-700\\..*")
+elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-70[0-9]\\..*")
set(COMPILER_FAMILY "clang")
# gcc
http://git-wip-us.apache.org/repos/asf/arrow/blob/5a68f8d7/python/cmake_modules/CompilerInfo.cmake
----------------------------------------------------------------------
diff --git a/python/cmake_modules/CompilerInfo.cmake b/python/cmake_modules/CompilerInfo.cmake
index e66bc26..55f989a 100644
--- a/python/cmake_modules/CompilerInfo.cmake
+++ b/python/cmake_modules/CompilerInfo.cmake
@@ -34,7 +34,7 @@ elseif("${COMPILER_VERSION_FULL}" MATCHES ".*based on LLVM.*")
# clang on Mac OS X, XCode 7. No version replacement is done
# because Apple no longer advertises the upstream LLVM version.
-elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-700\\..*")
+elseif("${COMPILER_VERSION_FULL}" MATCHES "clang-70[0-9]\\..*")
set(COMPILER_FAMILY "clang")
# gcc