Skip to content

Commit 9642430

Browse files
committed
Bumped versions of Emscripten and Cmake.
Also do more test runs to build a more comprehensive set of system libs.
1 parent ae0d739 commit 9642430

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

Dockerfile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
FROM ubuntu:latest
22

33
RUN apt-get update && \
4-
apt-get install -y git wget make python3 xz-utils lbzip2
4+
apt-get install -y git wget make python3 xz-utils lbzip2 libatomic1
55

66
# Grabbing Emscripten.
77
RUN git clone https://github.com/emscripten-core/emsdk.git && \
88
cd emsdk && \
9-
./emsdk install 3.1.68 && \
10-
./emsdk activate 3.1.68
9+
./emsdk install 4.0.20 && \
10+
./emsdk activate 4.0.20
1111

1212
# Grabbing CMake.
13-
RUN wget https://github.com/Kitware/CMake/releases/download/v3.30.4/cmake-3.30.4-linux-x86_64.sh -O cmake_install.sh && \
13+
RUN wget https://github.com/Kitware/CMake/releases/download/v4.2.0/cmake-4.2.0-linux-x86_64.sh -O cmake_install.sh && \
1414
mkdir cmake && \
1515
bash cmake_install.sh --prefix=cmake --skip-license && \
1616
rm cmake_install.sh
@@ -20,8 +20,15 @@ ENV PATH="/emsdk:/emsdk/upstream/emscripten:/cmake/bin:${PATH}"
2020
# Prebuilding system libraries so that we don't have to do it again in each use case.
2121
RUN mkdir test-bar && \
2222
touch test-bar/foo.c && \
23+
touch test-bar/foo.cpp && \
2324
cd test-bar && \
24-
/emsdk/upstream/emscripten/emcc --use-port=zlib -pthread --bind foo.c -o alpha && \
25-
/emsdk/upstream/emscripten/emcc --use-port=zlib -pthread --bind -O3 foo.c -o bravo && \
25+
/emsdk/upstream/emscripten/emcc --use-port=zlib -pthread --bind foo.c -o bar && \
26+
/emsdk/upstream/emscripten/emcc --use-port=zlib -pthread --bind -O3 foo.c -o bar && \
27+
/emsdk/upstream/emscripten/emcc --use-port=zlib -pthread -sMEMORY64 --bind foo.c -o bar && \
28+
/emsdk/upstream/emscripten/emcc --use-port=zlib -pthread -sMEMORY64 --bind -O3 foo.c -o bar && \
29+
/emsdk/upstream/emscripten/em++ --use-port=zlib -pthread --bind foo.c -o bar && \
30+
/emsdk/upstream/emscripten/em++ --use-port=zlib -pthread --bind -O3 foo.cpp -o bar && \
31+
/emsdk/upstream/emscripten/em++ --use-port=zlib -pthread -sMEMORY64 --bind foo.cpp -o bar && \
32+
/emsdk/upstream/emscripten/em++ --use-port=zlib -pthread -sMEMORY64 --bind -O3 foo.cpp -o bar && \
2633
cd ../ && \
2734
rm -rf test-bar

0 commit comments

Comments
 (0)