diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 09:22:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-31 09:22:21 +0300 |
| commit | 04647611260a77041186ace12f96b05d50bed4da (patch) | |
| tree | 3f8efa00ae2fa2bc6be5165658c34c79c9437a3f /storage/rocksdb | |
| parent | dc6bc85cd29586631d927036451d955c7013206c (diff) | |
| parent | e835cc851e389770219a33037af65db8887cc9a8 (diff) | |
| download | mariadb-git-04647611260a77041186ace12f96b05d50bed4da.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/rocksdb')
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 5dfd94c6212..f985d3c0b4f 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -44,6 +44,15 @@ IF (WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4) SKIP_ROCKSDB_PLUGIN("32-Bit Windows are temporarily disabled") ENDIF() +# +# Also, disable on ARM64 when not Linux +# Requires submodule update to v6.16.3 +# containing commit https://github.com/facebook/rocksdb/commit/ee4bd4780b321ddb5f92a0f4eb956f2a2ebd60dc +# +IF(CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64|aarch64)" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") + SKIP_ROCKSDB_PLUGIN("ARM64 disabled on all except Linux") +ENDIF() + # This plugin needs recent C++ compilers (it is using C++11 features) # Skip build for the old compilers SET(CXX11_FLAGS) |