Travis CI: Fix linux/i686 build; set language to C++

(fix commit caa4a79)

Note: libgccpp and test_cpp are disabled for 32-bit builds currently.

diff --git a/.travis.yml b/.travis.yml
index 94969988f064d884b4916a0dfcbe2b5700dc2909..cb603a09167292408fa4636a214249c45be26941 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-language: c
+language: c++
 
 os:
   - linux
@@ -20,12 +20,12 @@ matrix:
 sudo: required
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CFLAGS_EXTRA" == -m32* ]]; then sudo apt-get install libc6:i386 libc6-dev-i386; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CFLAGS_EXTRA" == -m32* ]]; then sudo apt-get install gcc-multilib; else ENABLE_CPP=--enable-cplusplus; fi
 
 install:
   - git clone --depth=50 https://github.com/ivmai/libatomic_ops.git
   - ./autogen.sh
 
 script:
-  - ./configure --enable-cplusplus --enable-gc-debug --enable-munmap --enable-werror
+  - ./configure $ENABLE_CPP --enable-gc-debug --enable-munmap --enable-werror
   - make -j check CFLAGS_EXTRA="$CFLAGS_EXTRA"