Merge pull request #8427 from tom-cosgrove-arm/fix-linux-builds-in-conda-forge

Fix builds in conda-forge, which doesn't have CLOCK_BOOTTIME
This commit is contained in:
Tom Cosgrove 2023-10-30 15:29:26 +00:00 committed by GitHub
commit 3857bad9a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -0,0 +1,2 @@
Bugfix
* Fix build failure in conda-forge. Fixes #8422.

View File

@ -265,7 +265,7 @@ mbedtls_ms_time_t mbedtls_ms_time(void)
struct timespec tv;
mbedtls_ms_time_t current_ms;
#if defined(__linux__)
#if defined(__linux__) && defined(CLOCK_BOOTTIME)
ret = clock_gettime(CLOCK_BOOTTIME, &tv);
#else
ret = clock_gettime(CLOCK_MONOTONIC, &tv);