-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mysql8: disable CMake Xcode check and use the compiler-blacklist port…
…group
- Loading branch information
1 parent
39e260d
commit 935f008
Showing
2 changed files
with
49 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,42 @@ | |||
--- ./cmake/os/Darwin.cmake.orig 2019-06-10 02:21:49.000000000 -0400 | |||
+++ ./cmake/os/Darwin.cmake 2019-06-10 02:46:18.000000000 -0400 | |||
@@ -24,21 +24,24 @@ | |||
|
|||
INCLUDE(CheckCSourceRuns) | |||
|
|||
-# We require at least XCode 9.0 | |||
-IF(NOT FORCE_UNSUPPORTED_COMPILER) | |||
- IF(CMAKE_C_COMPILER_ID MATCHES "Clang") | |||
- CHECK_C_SOURCE_RUNS(" | |||
- int main() | |||
- { | |||
- return (__clang_major__ < 9); | |||
- }" HAVE_SUPPORTED_CLANG_VERSION) | |||
- IF(NOT HAVE_SUPPORTED_CLANG_VERSION) | |||
- MESSAGE(FATAL_ERROR "XCode 9.0 or newer is required!") | |||
- ENDIF() | |||
- ELSE() | |||
- MESSAGE(FATAL_ERROR "Unsupported compiler!") | |||
- ENDIF() | |||
-ENDIF() | |||
+# MACPORTS: XCode version check disabled to rely instead on compiler | |||
+# blacklisting in the ports build process. | |||
+# | |||
+# # We require at least XCode 9.0 | |||
+# IF(NOT FORCE_UNSUPPORTED_COMPILER) | |||
+# IF(CMAKE_C_COMPILER_ID MATCHES "Clang") | |||
+# CHECK_C_SOURCE_RUNS(" | |||
+# int main() | |||
+# { | |||
+# return (__clang_major__ <= 9); | |||
+# }" HAVE_SUPPORTED_CLANG_VERSION) | |||
+# IF(NOT HAVE_SUPPORTED_CLANG_VERSION) | |||
+# MESSAGE(FATAL_ERROR "XCode 9.0 or newer is required!") | |||
+# ENDIF() | |||
+# ELSE() | |||
+# MESSAGE(FATAL_ERROR "Unsupported compiler!") | |||
+# ENDIF() | |||
+# ENDIF() | |||
|
|||
# This is used for the version_compile_machine variable. | |||
IF(CMAKE_SIZEOF_VOID_P MATCHES 8) |