Skip to content

Commit fd750dc

Browse files
committed
fix #108: macOS Big Sur: dtrace does not understand -G switch
1 parent 93921f4 commit fd750dc

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

CMake/EnableDtrace.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ function(enable_dtrace_for TARGET PROBES_D PROBES_H)
3030
set_source_files_properties(${TARGET}_probes.o PROPERTIES
3131
GENERATED true
3232
EXTERNAL_OBJECT true)
33-
else() # not Linux
33+
return()
34+
endif()
35+
cmake_host_system_information(RESULT OS_RELEASE QUERY OS_RELEASE)
36+
if(NOT (CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin AND OS_RELEASE VERSION_GREATER_EQUAL 11))
3437
set(PROBES_C ${TARGET}_probes.cc)
3538
file(GENERATE
3639
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PROBES_C}

ChangeLog-1.1.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
77
**Changes from beta2:**
88

9+
* Fix [gh #108](https://github.com/m6w6/libmemcached/issues/105):
10+
macOS Big Sur: dtrace does not understand -G switch
911
* Fix libmemcachedprotocol's binary `STAT` and `VERSION` handlers.
1012
* Fix [gh #105](https://github.com/m6w6/libmemcached/issues/105):
1113
EINTR handled too defensively when polling.

docs/source/ChangeLog-1.1.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ v 1.1.0-beta3
1616
**Changes from beta2:**
1717

1818

19+
* Fix `gh #108 <https://github.com/m6w6/libmemcached/issues/105>`_\ :
20+
macOS Big Sur: dtrace does not understand -G switch
1921
* Fix libmemcachedprotocol's binary ``STAT`` and ``VERSION`` handlers.
2022
* Fix `gh #105 <https://github.com/m6w6/libmemcached/issues/105>`_\ :
2123
EINTR handled too defensively when polling.

0 commit comments

Comments
 (0)