diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:12:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:15:10 +0200 |
| commit | c9717dc0190731c656cce31fa6e39a3db123e3af (patch) | |
| tree | 3db056a3f50e565294d127edb5339afb0a994749 /storage/mroonga/vendor/groonga/lib | |
| parent | 33721d91389759a917463a044fbd6f0b7654d629 (diff) | |
| parent | 1d411a8a440922f0538c1be254d6f4396af453a1 (diff) | |
| download | mariadb-git-c9717dc0190731c656cce31fa6e39a3db123e3af.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/mroonga/vendor/groonga/lib')
| -rw-r--r-- | storage/mroonga/vendor/groonga/lib/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt index 2274e95aa24..64fadb8bbdd 100644 --- a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt @@ -179,6 +179,7 @@ if(GRN_WITH_MRUBY) endif() # Workaround GCC ICE on ARM64 -IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") +IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" AND + CMAKE_C_COMPILER_VERSION VERSION_GREATER "5") ADD_COMPILE_FLAGS(ts/ts_expr_node.c COMPILE_FLAGS "-fno-tree-loop-vectorize") ENDIF() |