diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 282c8b1e..4fdaed04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,12 +194,8 @@ if (CMAKE_USE_PTHREADS_INIT) if (ANDROID OR MSYS) # ANDROID variable is defined by CMake v3.7.0+. # Android NDK does not provide pthread_atfork. elseif (APPLE) - if (enable_handle_fork AND NOT disable_handle_fork) - # The incremental mode conflicts with fork handling. - if (enable_parallel_mark) - add_definitions("-DHANDLE_FORK") - endif(enable_parallel_mark) - endif() + # The incremental mode conflicts with fork handling (for now). + # Thus, HANDLE_FORK is not defined. set(SRC ${SRC} darwin_stop_world.c) elseif (enable_handle_fork AND NOT disable_handle_fork) add_definitions("-DHANDLE_FORK") diff --git a/configure.ac b/configure.ac index eb0b582c..f5842f5c 100644 --- a/configure.ac +++ b/configure.ac @@ -1177,11 +1177,7 @@ elif test "${enable_handle_fork}" != manual -a x$THREADS = xposix; then # Android NDK does not provide pthread_atfork. ;; *-*-darwin*) - # The incremental mode (which is off if parallel marking) conflicts - # with fork handling on Darwin. - if test x$use_parallel_mark != xno; then - AC_DEFINE(HANDLE_FORK) - fi + # The incremental mode conflicts with fork handling on Darwin. ;; *-*-aix* | *-*-cygwin* | *-*-freebsd* | *-*-haiku* | \ *-*-hpux11* | *-*-irix* | *-*-kfreebsd*-gnu | \ |