Skip to content

Commit

Permalink
ARROW-93: Fix builds when using XCode 7.3
Browse files Browse the repository at this point in the history
Author: Dan Robinson <danrobinson010@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
  • Loading branch information
danrobinson authored and wesm committed Mar 31, 2016
1 parent 2d8627c commit 5a68f8d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cpp/cmake_modules/CompilerInfo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/cmake_modules/CompilerInfo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5a68f8d

Please sign in to comment.