diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-12 01:33:43 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-04-12 01:33:43 +0200 |
| commit | f544b21fcb0a05caeb2e375d8156da890b34c88a (patch) | |
| tree | d3cc5ee45c9c637aeac0fab49a248c5e9d1d0c8b /cmake/readline.cmake | |
| parent | 9f010e3294696f589a3d8e4fb7799a7ffa282658 (diff) | |
| download | mariadb-git-f544b21fcb0a05caeb2e375d8156da890b34c88a.tar.gz | |
Fix build on OSX
- Workaround linker bug that prevents linking aria test executables
using -fno-common on OSX
- Skip system readline detection (OSX readline is incompatible one)
- Make Xcode generator work
Diffstat (limited to 'cmake/readline.cmake')
| -rw-r--r-- | cmake/readline.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/readline.cmake b/cmake/readline.cmake index 49ab92f8bdb..fd2e690fab9 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -210,7 +210,10 @@ MACRO (MYSQL_CHECK_READLINE) IF(WITH_READLINE) MYSQL_USE_BUNDLED_READLINE() ELSE() - MYSQL_FIND_SYSTEM_READLINE() + # OSX includes incompatible readline lib + IF (NOT APPLE) + MYSQL_FIND_SYSTEM_READLINE() + ENDIF() IF(NOT USE_NEW_READLINE_INTERFACE) MYSQL_FIND_SYSTEM_LIBEDIT() IF(NOT USE_LIBEDIT_INTERFACE) |