Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-07-14 05:11:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

..

1 Commits
update-web ... update_too

Author SHA1 Message Date
Bensuperpc
38488ad561 Update tools scripts 
Fix bug with dockcross-make-builder.sh

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
 2021-09-25 09:54:59 +02:00
2 changed files with 3 additions and 3 deletions

2
tools/dockcross-make-builder.sh

@ -16,7 +16,7 @@ if (( $# >= 1 )); then
chmod +x ./dockcross-"$image"
echo "Build $build_file"
./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC}' $make_arg
./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
else
echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
exit 1

4
web-wasm/Dockerfile.in

@ -1,4 +1,4 @@
FROM emscripten/emsdk:2.0.30
FROM emscripten/emsdk:2.0.29
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Revert back to "/bin/sh" as default shell
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
#include "common.docker"
ENV EMSCRIPTEN_VERSION 2.0.30
ENV EMSCRIPTEN_VERSION 2.0.29
ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
ENV CC=/emsdk/upstream/emscripten/emcc \