Skip to content

Commit 3587054

Browse files
committed
Dockerfile.emscripten: Use && instead of ; everywhere
1 parent 318dedf commit 3587054

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

scripts/docker/buildpack-deps/Dockerfile.emscripten

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ FROM emscripten/emsdk:3.1.19 AS base
3636
LABEL version="12"
3737

3838
ADD emscripten.jam /usr/src
39-
RUN set -ex; \
40-
\
39+
RUN set -ex && \
40+
\
4141
apt-get update && \
4242
apt-get install lz4 --no-install-recommends && \
43-
\
44-
cd /usr/src; \
45-
git clone https://github.com/Z3Prover/z3.git -b z3-4.8.17 --depth 1 ; \
46-
cd z3; \
47-
mkdir build; \
48-
cd build; \
43+
\
44+
cd /usr/src && \
45+
git clone https://github.com/Z3Prover/z3.git -b z3-4.8.17 --depth 1 && \
46+
cd z3 && \
47+
mkdir build && \
48+
cd build && \
4949
emcmake cmake \
5050
-DCMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot/usr \
5151
-DCMAKE_BUILD_TYPE=MinSizeRel \
@@ -55,21 +55,22 @@ RUN set -ex; \
5555
-DZ3_BUILD_EXECUTABLE=OFF \
5656
-DZ3_SINGLE_THREADED=ON \
5757
-DCMAKE_CXX_FLAGS="-s DISABLE_EXCEPTION_CATCHING=0" \
58-
..; \
59-
make ; make install; \
60-
rm -r /usr/src/z3; \
61-
cd /usr/src; \
62-
\
63-
wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2' -O boost.tar.bz2; \
64-
test "$(sha256sum boost.tar.bz2)" = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb boost.tar.bz2"; \
65-
tar -xf boost.tar.bz2; \
66-
rm boost.tar.bz2; \
67-
cd boost_1_75_0; \
68-
mv ../emscripten.jam .; \
69-
./bootstrap.sh; \
70-
echo "using emscripten : : em++ ;" >> project-config.jam ; \
58+
.. && \
59+
make && \
60+
make install && \
61+
rm -r /usr/src/z3 && \
62+
cd /usr/src && \
63+
\
64+
wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2' -O boost.tar.bz2 && \
65+
test "$(sha256sum boost.tar.bz2)" = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb boost.tar.bz2" && \
66+
tar -xf boost.tar.bz2 && \
67+
rm boost.tar.bz2 && \
68+
cd boost_1_75_0 && \
69+
mv ../emscripten.jam . && \
70+
./bootstrap.sh && \
71+
echo "using emscripten : : em++ ;" >> project-config.jam && \
7172
./b2 toolset=emscripten link=static variant=release threading=single runtime-link=static \
7273
--with-system --with-filesystem --with-test --with-program_options \
7374
cxxflags="-s DISABLE_EXCEPTION_CATCHING=0 -Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" \
74-
--prefix=$(em-config CACHE)/sysroot/usr install; \
75+
--prefix=$(em-config CACHE)/sysroot/usr install && \
7576
rm -r /usr/src/boost_1_75_0

0 commit comments

Comments
 (0)