diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-03-26 14:51:32 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2014-03-26 23:31:02 -0700 |
| commit | 0c3824702d3d59d37f8c177d646303f546187683 (patch) | |
| tree | 1546a27055987b20ef85776cadbdcddd3533f3d6 /.travis.yml | |
| parent | 9946a92af31b30cb7760150d1f8ca6c11b01aeea (diff) | |
| download | libffi-0c3824702d3d59d37f8c177d646303f546187683.tar.gz | |
Always set CC_FOR_TARGET for dejagnu, to make the testsuite respect $CC
This fixes cross-compilation and compilation with CC="gcc -m32".
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 6633e6f..7c8d302 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,15 @@ compiler: - gcc - clang env: - - build32=false - - build32=true + - + - HOST=i386-pc-linux-gnu matrix: exclude: - compiler: clang - env: build32=true + env: HOST=i386-pc-linux-gnu before_script: - sudo apt-get install dejagnu texinfo - - if $build32 ; then sudo apt-get install gcc-multilib g++-multilib ; fi + - if [ "$HOST" = i386-pc-linux-gnu ] ; then sudo apt-get install gcc-multilib g++-multilib && CC="$CC -m32" ; fi -script: run= && if $build32 ; then run=i386 && mkdir path32 && PATH="$(pwd)/path32:$PATH" && printf '#!/bin/sh\nexec /usr/bin/'"$CC"' -m32 "$@"' > "path32/$CC" && chmod a+x "path32/$CC" ; fi && ./autogen.sh && $run ./configure && make && make dist && make check +script: ./autogen.sh && ./configure ${HOST+--host=$HOST} && make && make dist && make check |