From: Anders F Björklund <anders.f.bjorklund@gmail.com>
Date: Sun, 8 Apr 2018 11:51:06 +0000 (+0200)
Subject: Add a 32-bit build target, using multilib (-m32)
X-Git-Tag: v3.4.3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=047d387da9d4dfe8a4e5af6b47859e7e8c15be6f;p=thirdparty%2Fccache.git

Add a 32-bit build target, using multilib (-m32)

Use gcc-multilib rather than doing a full cross-compile.
But set the --host, just in case something is listening.
---

diff --git a/.travis.sh b/.travis.sh
index 63bec03ea..ad6467838 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,7 +1,8 @@
 #!/bin/sh -ex
 make clean
-make travis CC=clang
 make travis CC=gcc
+make travis CC=clang
+make travis CC=gcc CFLAGS="-m32 -g -O2" HOST="--host=i386-linux-gnu"
 make travis CC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" TEST="unittest/run.exe"
 make travis CC=clang CFLAGS="-fsanitize=undefined" ASAN_OPTIONS="detect_leaks=0"
 make travis CC=clang CFLAGS="-fsanitize=address -g" ASAN_OPTIONS="detect_leaks=0"
diff --git a/.travis.yml b/.travis.yml
index 7cb987ce4..31438d6ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,17 +6,25 @@ addons:
             - gperf
             - elfutils
             - zlib1g-dev
+            - lib32z1-dev
 
 os:
     - linux
     - osx
 
 compiler:
-    - clang
     - gcc
+    - clang
 
 matrix:
     include:
+        - os: linux
+          compiler: gcc
+          env: CFLAGS="-m32 -g -O2" HOST="--host=i386-linux-gnu"
+          addons:
+              apt:
+                  packages:
+                      - gcc-multilib
         - os: linux
           compiler: i686-w64-mingw32-gcc
           env: HOST="--host=i686-w64-mingw32" TEST="unittest/run.exe"
diff --git a/.travis/Dockerfile b/.travis/Dockerfile
index 37ec58885..5f837b0ed 100644
--- a/.travis/Dockerfile
+++ b/.travis/Dockerfile
@@ -13,6 +13,8 @@ RUN apt-get -qq update && apt-get install -y --no-install-recommends \
                 libc6-dev \
                 gcc \
                 clang \
+                libc6-dev-i386 \
+                gcc-multilib \
                 gcc-mingw-w64 \
                 make \
                 autoconf \
@@ -31,4 +33,5 @@ RUN apt-get -qq update && apt-get install -y --no-install-recommends \
                 gperf \
                 elfutils \
                 zlib1g-dev \
+                lib32z1-dev \
         && rm -rf /var/lib/apt/lists/*