Update Travis from trusty to xenial. (#84)

* Update Travis from trusty to xenial. * Don't use getentropy on GLIBC < 2.25.
2019-03-31 05:46:32 -07:00
parent 05a05551ba
commit 7378a0bfbe
2 changed files with 9 additions and 2 deletions
--- a/wasmtime-wasi/sandboxed-system-primitives/src/config.h
+++ b/wasmtime-wasi/sandboxed-system-primitives/src/config.h
@@ -12,13 +12,20 @@
 #ifndef CONFIG_H
 #define CONFIG_H

+#include <stdlib.h>
+
 #if defined(__FreeBSD__) || defined(__APPLE__)
 #define CONFIG_HAS_ARC4RANDOM_BUF 1
 #else
 #define CONFIG_HAS_ARC4RANDOM_BUF 0
 #endif

-#ifdef __linux__
+// On Linux, prefer to use getentropy, though it isn't available in
+// GLIBC before 2.25.
+#if defined(__linux__) && \
+    (!defined(__GLIBC__) || \
+     __GLIBC__ > 2 || \
+     (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 25))
 #define CONFIG_HAS_GETENTROPY 1
 #else
 #define CONFIG_HAS_GETENTROPY 0