From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 29 Jan 2017 05:51:30 +0000 (+0300)
Subject: Travis CI: compile both for x86 and x64
X-Git-Tag: v7.4.6~163
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b19d053ffe99cf9056ee621d39dae7c5ed48dc1a;p=gc

Travis CI: compile both for x86 and x64
(Cherry-pick part of commits caa4a79, 6c48bae, 64eb548 from 'master'.)
---

diff --git a/.travis.yml b/.travis.yml
index d2fc2678..1d65e4dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,21 @@ compiler:
   - clang
   - gcc
 
+env:
+  - CFLAGS_EXTRA_M=
+  - CFLAGS_EXTRA_M=-m32
+
 matrix:
   exclude:
   - os: osx
     compiler: gcc
 
-sudo: false
+sudo: required
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CFLAGS_EXTRA_M" == "-m32" ]]; then
+      sudo apt-get install gcc-multilib;
+    fi
 
 install:
   - git clone --depth=50 https://github.com/ivmai/libatomic_ops.git -b release-7_4
@@ -21,4 +30,4 @@ install:
 
 script:
   - ./configure --enable-munmap
-  - make -j check
+  - make -j check CFLAGS_EXTRA="$CFLAGS_EXTRA_M"