travis: add x86 musl

* .travis.yml (matric): Add musl-gcc/x86.
* travis-build.sh [TARGET == x86]: Specify --target along with --build
to configure.
* travis-install.sh [CC == musl-gcc && TARGET == x32]: Add -mx32 to $CC.
[CC == musl-gcc && TARGET == x86]: Add -m32 to $CC.  Specify --build
and --target to musl configure invocation.

diff --git a/.travis.yml b/.travis.yml
index d3307a02b29df345b14d05849d81645a951e0b18..0eba591dc6a481769ad49942495b244b6fd7c147 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,3 +39,6 @@ matrix:
     - compiler: clang-3.6
       env:
         - TARGET=x86
+    - compiler: musl-gcc
+      env:
+        - TARGET=x86

diff --git a/travis-build.sh b/travis-build.sh
index e6da4bb1f7977fde849d327076fec3e778b9d0e7..32ccd5080f39a0cb5c07934ec7cf4e83b630ddb1 100755 (executable)
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -17,7 +17,7 @@ case "${TARGET-}" in
                ;;
        x86)
                CC="$CC -m32"
-               export DISTCHECK_CONFIGURE_FLAGS='--build=i686-pc-linux-gnu'
+               export DISTCHECK_CONFIGURE_FLAGS='--build=i686-pc-linux-gnu --target=i686-pc-linux-gnu'
                ;;
 esac
 

diff --git a/travis-install.sh b/travis-install.sh
index a34e5d0e720734bc580a042a7d08f7f35a51348d..ba5ff2dfc96b0f754a2de45dd54771f43d05a2a3 100755 (executable)
--- a/travis-install.sh
+++ b/travis-install.sh
@@ -23,7 +23,17 @@ case "$CC" in
                git clone --depth=1 https://github.com/strace/musl
                cd musl
                        CC=gcc
-                       ./configure --prefix=/opt/musl --exec-prefix=/usr
+                       build=
+                       case "${TARGET-}" in
+                               x32)
+                                       CC="$CC -mx32"
+                                       ;;
+                               x86)
+                                       CC="$CC -m32"
+                                       build='--build=i686-pc-linux-gnu --target=i686-pc-linux-gnu'
+                                       ;;
+                       esac
+                       ./configure --prefix=/opt/musl --exec-prefix=/usr ${build}
                        make
                        sudo make install
                cd -