Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-10 21:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

browser-asmjs: Update to depend on existing image from "trzeci/emscripten"

Browse Source 
This commit updates the "browser-asmjs" images to avoid systematic
rebuild of emscripten sdk. Instead, it introduces dependency on the
image maintained by @trzeci

Note also:

* emscripten sdk updated from 1.36.7 to 1.36.14

* symlinking of "/bin/bash" as "/bin/sh" is reverted. This ensures other
  images including file like "common.debian" and relying on standard "sh"
  behavior will work as expected.

* workaround associated with CMakeForceCompiler has been removed from
  Dockerfile. Emscripten as been fixed.
  See https://github.com/kripken/emscripten/pull/4477

* we will revisit once official images are available.
  See https://github.com/kripken/emscripten/issues/4682
This commit is contained in:
Jean-Christophe Fillion-Robin
2016-11-25 15:45:32 -05:00
parent 46cef1a33a
commit 09868d5289
4 changed files with 48 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -39,8 +39,8 @@ test: base.test $(addsuffix .test,$(IMAGES))
#
# browser-asmjs
#
browser-asmjs: base browser-asmjs/Dockerfile.in common.docker
sed '/common.docker/ r common.docker' $@/Dockerfile.in > $@/Dockerfile
browser-asmjs: base browser-asmjs/Dockerfile.in common.docker common.debian
sed -e '/common.docker/ r common.docker' -e '/common.debian/ r common.debian' $@/Dockerfile.in > $@/Dockerfile
mkdir -p $@/imagefiles && cp -r imagefiles $@/
cp -r test browser-asmjs/
$(DOCKER) build -t $(ORG)/browser-asmjs \