diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-30 11:15:34 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-10-30 16:36:08 -0700 |
| commit | 03e2d1e045bed568a613140ce3084158d22a6571 (patch) | |
| tree | 9f035e334e83f0e8a1ab6d0a4153c0f5d41e775d /scripts/docker | |
| parent | bd0d7bd0faa1ff735f929e67d8dd9408a527c5d9 (diff) | |
| download | subsurface-03e2d1e045bed568a613140ce3084158d22a6571.tar.gz | |
build-system: create an MXE docker container for both 32 & 64 bit
This should allow us to then do both 32 and 64 bit Windows builds in our CI/CD
and of course for our releases.
In order to still be able to use this container in a GitHub action, aggressively
remove things that we won't need during the build. Since we use the experimental
-squash argument during docker build, this should get us a much smaller container
image in the end.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker')
| -rw-r--r-- | scripts/docker/mxe-build-container/Dockerfile | 1 | ||||
| -rw-r--r-- | scripts/docker/mxe-build-container/settings.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/docker/mxe-build-container/Dockerfile b/scripts/docker/mxe-build-container/Dockerfile index 08bdd619c..cf15ff2fe 100644 --- a/scripts/docker/mxe-build-container/Dockerfile +++ b/scripts/docker/mxe-build-container/Dockerfile @@ -72,3 +72,4 @@ RUN cd /win/mxe ; \ make MXE_TARGETS=x86_64-w64-mingw32.static glib mdbtools -j 6 2>&1 | tee -a mxe-build.log ; RUN apt-get remove -y bison flex gperf libc6-dev-i386 libgdk-pixbuf2.0-dev libxml-parser-perl python ruby xz-utils scons && rm -rf /var/lib/apt/lists/* +RUN rm -rf /win/mxe/pkg /win/mxe/log /win/mxe/docs diff --git a/scripts/docker/mxe-build-container/settings.mk b/scripts/docker/mxe-build-container/settings.mk index fecac6e06..dfd391b1d 100644 --- a/scripts/docker/mxe-build-container/settings.mk +++ b/scripts/docker/mxe-build-container/settings.mk @@ -6,7 +6,7 @@ JOBS := 8 # This variable controls the targets that will build. -MXE_TARGETS := x86_64-w64-mingw32.shared +MXE_TARGETS := x86_64-w64-mingw32.shared i686-w64-mingw32.shared # The three lines below makes `make` build these "local packages" instead of all packages. # The ordering of the list appears weird, but this seems to help to get the build done |