From 9d5bd29d8dfb5f89d0927a175443240a19e93890 Mon Sep 17 00:00:00 2001
From: Anthony Green <green@moxielogic.com>
Date: Tue, 13 Mar 2018 23:07:10 -0400
Subject: [PATCH] Refactor

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5e30203e..6fcbdc0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,19 +15,18 @@ matrix:
   include:
     - os: linux
       compiler: gcc
-      env: HOST=i386-pc-linux-gnu
+      env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"'
     - os: linux
-      env: HOST=moxie-elf PATH=/opt/moxielogic/bin:$PATH
+      env: HOST=moxie-elf MEVAL='export PATH=/opt/moxielogic/bin:$PATH && LDFLAGS="-Tsim.ld" && CC=moxie-elf-gcc && CXX=moxie-elf-g++ && RUNTESTFLAGS="--target_board moxie-sim" && DEJAGNU="$TRAVIS_BUILD_DIR"/.travis'
 
 install:
   - ./.travis/install.sh
 
 script:
   - ./autogen.sh
-  - if test x"$HOST" = x"i386-pc-linux-gnu"; then CC="$CC -m32"; CXX="$CXX -m32"; fi
-  - if test x"$HOST" = x"moxie-unknown-elf"; then LDFLAGS="-Tsim.ld"; RUNTESTFLAGS="--target_board moxie-sim"; fi
+  - if test x"$MEVAL" != x; then eval ${MEVAL}; fi
   - ./configure ${HOST+--host=$HOST} ${CONFIGURE_OPTIONS}
   - make
   - make dist
-  - ${DEJAGNU+DEJAGNU="$TRAVIS_BUILD_DIR"/.travis} make check
+  - make check
   - cat */testsuite/libffi.log