diff options
| author | John Hawthorn <john@hawthorn.email> | 2021-05-12 14:17:43 -0700 |
|---|---|---|
| committer | Peter Zhu <peter@peterzhu.ca> | 2021-05-13 11:14:30 -0400 |
| commit | 0aa4ca1477e76c7ea0b5d76b4afbc226297dd874 (patch) | |
| tree | bebdc019f95102ff193ce50612f64daf11644627 | |
| parent | 2420119f47a6c5d478c721b2f30565d5a074dd32 (diff) | |
Fix compilation with jemalloc on macos
On darwin we avoid including sys/user.h to avoid a conflict. Previously
we still ended up with PAGE_SIZE being defined because the headers for
system malloc define it. However, when compiling with jemalloc nothing
would define PAGE_SIZE.
This commit changes configure.ac so that we never use the PAGE_SIZE
constant on darwin and to always use the sysconf fallback.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4494
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a1a0872f69..ac737f6cc8 100644 --- a/configure.ac +++ b/configure.ac @@ -2733,7 +2733,7 @@ main(int argc, char *argv[]) ]) AS_CASE([$target_os], - [darwin*], [ac_cv_header_sys_user_h=yes], dnl LIST_HEAD conflicts with sys/queue.h + [darwin*], [ac_cv_header_sys_user_h=no], dnl LIST_HEAD conflicts with sys/queue.h [AC_CHECK_HEADERS([sys/user.h])] ) AS_IF([test "x$ac_cv_func_mmap:$ac_cv_header_sys_user_h" = xyes:yes], [ |