diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-04-04 22:00:03 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-04-04 22:00:03 +0300 |
| commit | ebce682557c34fc6cf0837afe66ede25b1f849b8 (patch) | |
| tree | 48585d0566b0eaa506ece99e4a646df6b294e69a | |
| parent | 15878ee41c5845403faf16d853011375550f0727 (diff) | |
| parent | 23b86a18e67ae7a52da84031bd2bc355f350b814 (diff) | |
| download | mariadb-git-ebce682557c34fc6cf0837afe66ede25b1f849b8.tar.gz | |
Merge ../10.2-mariarocks into 10.2mariadb-10.2.5
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 0ae3b240273..308bd26592e 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -22,6 +22,13 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i[36]86") SKIP_ROCKSDB_PLUGIN("Intel 32 bit not supported.") ENDIF() +# +# Also, disable building on 32-bit Windows +# +IF (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4) + SKIP_ROCKSDB_PLUGIN("32-Bit Windows are temporarily disabled") +ENDIF() + # This plugin needs recent C++ compilers (it is using C++11 features) # Skip build for the old compilers SET(CXX11_FLAGS) |