diff options
| author | Vladislav Vaintroub <vvaintroub@macbook.local> | 2010-01-21 01:42:17 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@macbook.local> | 2010-01-21 01:42:17 +0100 |
| commit | 6e0d56232011e771ded00a0958bb18d930961509 (patch) | |
| tree | 9dde31e085ed7485c056e95cbf358adc2b42ec99 | |
| parent | 4060fe7d43fb3028ceb7b4662309ca1f76246dca (diff) | |
| download | mariadb-git-6e0d56232011e771ded00a0958bb18d930961509.tar.gz | |
Fix failing yassl tests on OSX
WORDS_BIGENDIAN was wrongly defined to 1
| -rw-r--r-- | config.h.cmake | 8 | ||||
| -rw-r--r-- | configure.cmake | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/config.h.cmake b/config.h.cmake index 8c0c8ae3094..e101a02e295 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -428,7 +428,13 @@ #endif #define STRUCT_RLIMIT struct rlimit -#cmakedefine WORDS_BIGENDIAN 1 +#ifdef __APPLE__ + #if __BIG_ENDIAN + #define WORDS_BIGENDIAN 1 + #endif +#else +#cmakedefine WORDS_BIGENDIAN 1 +#endif /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ diff --git a/configure.cmake b/configure.cmake index 7037e3eab37..47d0f137d43 100644 --- a/configure.cmake +++ b/configure.cmake @@ -702,9 +702,9 @@ int main() { # INCLUDE(TestBigEndian) IF(APPLE) - # Can'r run endian test on universal PPC/Intel binaries + # Cannot run endian test on universal PPC/Intel binaries # would return inconsistent result. - SET(WORDS_BIGENDIAN __BIG_ENDIAN CACHE INTERNAL "big endian test") + # config.h.cmake includes a special #ifdef for Darwin ELSE() TEST_BIG_ENDIAN(WORDS_BIGENDIAN) ENDIF() |