Skip to content

Update Emscripten system types #1478

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
merged 10 commits into from
Sep 7, 2019
Merged

Update Emscripten system types #1478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
13175a8
Update Emscripten system types
tlively Aug 17, 2019
a5a5a90
Update emscripten version
tlively Aug 19, 2019
d3c7de8
Update emscripten, take 2
tlively Aug 19, 2019
e011365
Use git to acquire emsdk
tlively Aug 26, 2019
b7884db
Add libxml2, a new Fastcomp dependency
tlively Aug 26, 2019
89e8ae6
Add extra debug info in emscripten-entry.sh
tlively Aug 27, 2019
cd617d7
Revert "Add extra debug info in emscripten-entry.sh"
tlively Aug 27, 2019
71e47b8
Add libxml2 to wasm32 to be safe
tlively Aug 27, 2019
ccb0e40
Update ino_t
tlively Aug 29, 2019
06c980e
Remove accidental debugging config change
tlively Aug 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
1 change: 1 addition & 0 deletions ci/docker/asmjs-unknown-emscripten/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ RUN apt-get update && \
gcc \
git \
libc6-dev \
libxml2 \
python \
xz-utils

Expand Down
1 change: 1 addition & 0 deletions ci/docker/wasm32-unknown-emscripten/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ RUN apt-get update && \
gcc \
git \
libc6-dev \
libxml2 \
python \
cmake \
sudo \
Expand Down
14 changes: 5 additions & 9 deletions ci/emscripten.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,18 @@ exit 1
set -x
}

cd /
curl --retry 5 -L https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | \
tar -xz

git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable
cd /emsdk-portable
./emsdk update
hide_output ./emsdk install sdk-1.38.15-64bit
./emsdk activate sdk-1.38.15-64bit
# TODO: switch to an upstream install once
# https://github.com/rust-lang/rust/pull/63649 lands
hide_output ./emsdk install 1.38.42
./emsdk activate 1.38.42

# Compile and cache libc
# shellcheck disable=SC1091
source ./emsdk_env.sh
echo "main(){}" > a.c
HOME=/emsdk-portable/ emcc a.c
HOME=/emsdk-portable/ emcc -s BINARYEN=1 a.c
rm -f a.*

# Make emsdk usable by any user
Expand All @@ -53,4 +50,3 @@ chmod a+rxw -R /emsdk-portable
cd /
curl --retry 5 -L https://nodejs.org/dist/v12.3.1/node-v12.3.1-linux-x64.tar.xz | \
tar -xJ

10 changes: 5 additions & 5 deletions src/unix/linux_like/emscripten/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ pub type dev_t = u32;
pub type socklen_t = u32;
pub type pthread_t = c_ulong;
pub type mode_t = u32;
pub type ino64_t = u32;
pub type off64_t = i32;
pub type ino64_t = u64;
pub type off64_t = i64;
pub type blkcnt64_t = i32;
pub type rlim64_t = u64;
pub type shmatt_t = ::c_ulong;
Expand All @@ -16,14 +16,14 @@ pub type msglen_t = ::c_ulong;
pub type nfds_t = ::c_ulong;
pub type nl_item = ::c_int;
pub type idtype_t = ::c_uint;
pub type loff_t = i32;
pub type loff_t = i64;
pub type pthread_key_t = ::c_uint;

pub type clock_t = c_long;
pub type time_t = c_long;
pub type suseconds_t = c_long;
pub type ino_t = u32;
pub type off_t = i32;
pub type ino_t = u64;
pub type off_t = i64;
pub type blkcnt_t = i32;

pub type blksize_t = c_long;
Expand Down