diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-24 17:17:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-24 17:17:16 +0200 |
| commit | f1cc6e387479b8d1ab559b3a9f1cc8675607f78a (patch) | |
| tree | c7e72991c41baa9e2436cbc295e21ece203ccead /cmake | |
| parent | 6979d20426b222ecd4bcf3d69be161cc63d505d9 (diff) | |
| parent | 316f0d8fe3f3eda61bfe1025ef59a93dde3c753b (diff) | |
| download | mariadb-git-f1cc6e387479b8d1ab559b3a9f1cc8675607f78a.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/dtrace.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake index 3edcdc4c1c5..d7ab0f31991 100644 --- a/cmake/dtrace.cmake +++ b/cmake/dtrace.cmake @@ -42,7 +42,8 @@ MACRO(CHECK_DTRACE) # On FreeBSD, dtrace does not handle userland tracing yet IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT BUGGY_GCC_NO_DTRACE_MODULES - AND NOT BUGGY_LINUX_DTRACE) + AND NOT BUGGY_LINUX_DTRACE + AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS") SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace") ENDIF() SET(HAVE_DTRACE ${ENABLE_DTRACE}) |