Dockerfile.emscripten: Use `&& instead of ;` everywhere

This commit is contained in:
Marenz 2022-08-23 22:48:42 +02:00
parent 318dedf439
commit 35870549db

View File

@ -36,16 +36,16 @@ FROM emscripten/emsdk:3.1.19 AS base
LABEL version="12" LABEL version="12"
ADD emscripten.jam /usr/src ADD emscripten.jam /usr/src
RUN set -ex; \ RUN set -ex && \
\ \
apt-get update && \ apt-get update && \
apt-get install lz4 --no-install-recommends && \ apt-get install lz4 --no-install-recommends && \
\ \
cd /usr/src; \ cd /usr/src && \
git clone https://github.com/Z3Prover/z3.git -b z3-4.8.17 --depth 1 ; \ git clone https://github.com/Z3Prover/z3.git -b z3-4.8.17 --depth 1 && \
cd z3; \ cd z3 && \
mkdir build; \ mkdir build && \
cd build; \ cd build && \
emcmake cmake \ emcmake cmake \
-DCMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot/usr \ -DCMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot/usr \
-DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_BUILD_TYPE=MinSizeRel \
@ -55,21 +55,22 @@ RUN set -ex; \
-DZ3_BUILD_EXECUTABLE=OFF \ -DZ3_BUILD_EXECUTABLE=OFF \
-DZ3_SINGLE_THREADED=ON \ -DZ3_SINGLE_THREADED=ON \
-DCMAKE_CXX_FLAGS="-s DISABLE_EXCEPTION_CATCHING=0" \ -DCMAKE_CXX_FLAGS="-s DISABLE_EXCEPTION_CATCHING=0" \
..; \ .. && \
make ; make install; \ make && \
rm -r /usr/src/z3; \ make install && \
cd /usr/src; \ rm -r /usr/src/z3 && \
cd /usr/src && \
\ \
wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2' -O boost.tar.bz2; \ wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2' -O boost.tar.bz2 && \
test "$(sha256sum boost.tar.bz2)" = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb boost.tar.bz2"; \ test "$(sha256sum boost.tar.bz2)" = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb boost.tar.bz2" && \
tar -xf boost.tar.bz2; \ tar -xf boost.tar.bz2 && \
rm boost.tar.bz2; \ rm boost.tar.bz2 && \
cd boost_1_75_0; \ cd boost_1_75_0 && \
mv ../emscripten.jam .; \ mv ../emscripten.jam . && \
./bootstrap.sh; \ ./bootstrap.sh && \
echo "using emscripten : : em++ ;" >> project-config.jam ; \ echo "using emscripten : : em++ ;" >> project-config.jam && \
./b2 toolset=emscripten link=static variant=release threading=single runtime-link=static \ ./b2 toolset=emscripten link=static variant=release threading=single runtime-link=static \
--with-system --with-filesystem --with-test --with-program_options \ --with-system --with-filesystem --with-test --with-program_options \
cxxflags="-s DISABLE_EXCEPTION_CATCHING=0 -Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" \ cxxflags="-s DISABLE_EXCEPTION_CATCHING=0 -Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" \
--prefix=$(em-config CACHE)/sysroot/usr install; \ --prefix=$(em-config CACHE)/sysroot/usr install && \
rm -r /usr/src/boost_1_75_0 rm -r /usr/src/boost_1_75_0