Update travis to test linux 32/64 and osx with a mix of gcc and clang

.travis.yml

@@ -1,22 +1,24 @@
 language: cpp
+os:
+  - linux
+  - osx
 compiler:
   - gcc
   - clang
-env:
-  - HOST=i386-pc-linux-gnu
 matrix:
-  exclude:
+  include:
-    - compiler: clang
+    - os: linux
+      compiler: gcc
       env: HOST=i386-pc-linux-gnu
 
-before_script:
+install:
-  - sudo apt-get update
+  - ./.travis/install.sh
-  - sudo apt-get install dejagnu texinfo
-  - if [ "$HOST" = i386-pc-linux-gnu ] ; then sudo apt-get install gcc-multilib g++-multilib && CC="$CC -m32" && CXX="$CXX -m32" ; fi
 
 script:
   - ./autogen.sh
+  - if test x"$HOST" = x"i386-pc-linux-gnu"; then CC="$CC -m32"; CXX="$CXX -m32"; fi
   - ./configure ${HOST+--host=$HOST}
   - make
   - make dist
   - make check
+  - cat */testsuite/libffi.log

.travis/install.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME != 'linux' ]]; then
+  brew update
+  # fix an issue with libtool on travis by reinstalling it
+  brew uninstall libtool;
+  brew install libtool dejagnu;
+else
+  sudo apt-get update
+  sudo apt-get install dejagnu texinfo
+  if [ "$HOST" = i386-pc-linux-gnu ] ; then
+      sudo apt-get install gcc-multilib g++-multilib;
+  fi
+fi