Commit 04d14a66ff807a0ac2578ce886ef338aa2066b4d

Anthony Green 2019-11-07T09:23:10

Set QEMU_CPU within the build containers

diff --git a/.travis/build.sh b/.travis/build.sh
index df29156..ed0e495 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+if [ -z ${QEMU_CPU+x} ]; then
+    export SET_QEMU_CPU=
+else
+    export SET_QEMU_CPU=-e QEMU_CPU=${QEMU_CPU}
+fi
+
 function build_cfarm()
 {
     curl -u ${CFARM_AUTH} https://cfarm-test-libffi-libffi.apps.home.labdroid.net/test?host=${HOST}\&commit=${TRAVIS_COMMIT}
@@ -30,13 +36,13 @@ function build_linux()
 
 function build_foreign_linux()
 {
-    docker run --rm -t -i -v `pwd`:/opt -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" $2 bash -c /opt/.travis/build-in-container.sh
+    docker run --rm -t -i -v `pwd`:/opt ${SET_QEMU_CPU} -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" $2 bash -c /opt/.travis/build-in-container.sh
     exit $?
 }
 
 function build_cross_linux()
 {
-    docker run --rm -t -i -v `pwd`:/opt -e HOST="${HOST}" -e CC="${HOST}-gcc-8" -e CXX="${HOST}-g++-8" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" moxielogic/cross-ci-build-container:latest bash -c /opt/.travis/build-in-container.sh
+    docker run --rm -t -i -v `pwd`:/opt ${SET_QEMU_CPU} -e HOST="${HOST}" -e CC="${HOST}-gcc-8" -e CXX="${HOST}-g++-8" -e LIBFFI_TEST_OPTIMIZATION="${LIBFFI_TEST_OPTIMIZATION}" moxielogic/cross-ci-build-container:latest bash -c /opt/.travis/build-in-container.sh
     exit $?
 }