Skip to content

Update Travis from trusty to xenial. #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 5 commits into from
Mar 31, 2019
Merged

Update Travis from trusty to xenial. #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f958d7
Update Travis from trusty to xenial.
sunfishcode Mar 28, 2019
4746c4d
Investigating why getentropy is an unresolved symbol on xenial.
sunfishcode Mar 29, 2019
f662ce0
Don't use getentropy on GLIBC < 2.25.
sunfishcode Mar 29, 2019
07f5f7e
Fix .travis.yml syntax.
sunfishcode Mar 29, 2019
77a3640
Remove debugging code.
sunfishcode Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ matrix:
# Similarly, we don't need to hold up people using stable while we wait
# for the results which may fail.
fast_finish: true
dist: trusty
dist: xenial
sudo: false
before_script:
# If an old version of rustfmt from cargo is already installed, uninstall
Expand Down
9 changes: 8 additions & 1 deletion wasmtime-wasi/sandboxed-system-primitives/src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down