fix #108: macOS Big Sur: dtrace does not understand -G switch

diff --git a/CMake/EnableDtrace.cmake b/CMake/EnableDtrace.cmake
index d9b902babc89297538fea491bbee76fbf42009ab..ea7499d7e52b3171e0b811a3cf5f8f16c4fbe33d 100644 (file)
--- a/CMake/EnableDtrace.cmake
+++ b/CMake/EnableDtrace.cmake
@@ -30,7 +30,10 @@ function(enable_dtrace_for TARGET PROBES_D PROBES_H)
             set_source_files_properties(${TARGET}_probes.o PROPERTIES
                     GENERATED true
                     EXTERNAL_OBJECT true)
-        else() # not Linux
+            return()
+        endif()
+        cmake_host_system_information(RESULT OS_RELEASE QUERY OS_RELEASE)
+        if(NOT (CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin AND OS_RELEASE VERSION_GREATER_EQUAL 11))
             set(PROBES_C ${TARGET}_probes.cc)
             file(GENERATE
                     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PROBES_C}

diff --git a/ChangeLog-1.1.md b/ChangeLog-1.1.md
index 02090ca2189de053b7e6c523264997b3e423f868..2c5a94fc30cb6f3c9c22c1797217bc5f1f1de59a 100644 (file)
--- a/ChangeLog-1.1.md
+++ b/ChangeLog-1.1.md
@@ -6,6 +6,8 @@
 
 **Changes from beta2:**
 
+* Fix [gh #108](https://github.com/m6w6/libmemcached/issues/105):
+  macOS Big Sur: dtrace does not understand -G switch
 * Fix libmemcachedprotocol's binary `STAT` and `VERSION` handlers.
 * Fix [gh #105](https://github.com/m6w6/libmemcached/issues/105):
   EINTR handled too defensively when polling.

diff --git a/docs/source/ChangeLog-1.1.rst b/docs/source/ChangeLog-1.1.rst
index ab6458c96517be4e2759b38ab865028aa1087a2d..fc38c83ddd5713180cf02d1669cf724e54a7f985 100644 (file)
--- a/docs/source/ChangeLog-1.1.rst
+++ b/docs/source/ChangeLog-1.1.rst
@@ -16,6 +16,8 @@ v 1.1.0-beta3
 **Changes from beta2:**
 
 
+* Fix `gh #108 <https://github.com/m6w6/libmemcached/issues/105>`_\ :
+  macOS Big Sur: dtrace does not understand -G switch
 * Fix libmemcachedprotocol's binary ``STAT`` and ``VERSION`` handlers.
 * Fix `gh #105 <https://github.com/m6w6/libmemcached/issues/105>`_\ :
   EINTR handled too defensively when polling.