diff options
| author | Erlang/OTP <otp@erlang.org> | 2021-09-02 12:15:38 +0200 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2021-09-02 12:15:38 +0200 |
| commit | 776ae455f7f24b3d7e788b87464d1caa1692ea95 (patch) | |
| tree | 2b10174b715cd14cfd1453b8bce9a47bbfdc1469 | |
| parent | 9052e7996215b2d661b1f4c4f7d3c83c290d033d (diff) | |
| parent | 65c4efcdbfb8c524a6a5f4de1af2483213067e17 (diff) | |
| download | erlang-776ae455f7f24b3d7e788b87464d1caa1692ea95.tar.gz | |
Merge branch 'rickard/monotonic-hrtime/22/OTP-17493' into maint-22
* rickard/monotonic-hrtime/22/OTP-17493:
Update configure scripts
Fix monotonic hrtime configure test
| -rw-r--r-- | erts/aclocal.m4 | 2 | ||||
| -rwxr-xr-x | erts/configure | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index c5e9f66b1f..2a991b3a33 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -2531,7 +2531,7 @@ fi ERL_MONOTONIC_CLOCK(high_resolution, undefined, no) -case $$erl_monotonic_clock_low_resolution-$erl_monotonic_clock_func in +case $erl_monotonic_clock_low_resolution-$erl_monotonic_clock_func in no-mach_clock_get_time) monotonic_hrtime=yes AC_DEFINE(SYS_HRTIME_USING_MACH_CLOCK_GET_TIME, [1], [Define if you want to implement erts_os_hrtime() using mach clock_get_time()]) diff --git a/erts/configure b/erts/configure index b334b9e125..e1907b292e 100755 --- a/erts/configure +++ b/erts/configure @@ -21045,7 +21045,7 @@ $as_echo "$erl_cv_mach_clock_get_time_monotonic" >&6; } -case $$erl_monotonic_clock_low_resolution-$erl_monotonic_clock_func in +case $erl_monotonic_clock_low_resolution-$erl_monotonic_clock_func in no-mach_clock_get_time) monotonic_hrtime=yes |