aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2019-05-24 10:27:36 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-06-07 14:28:22 +0100
commit18e5ed202b773d8a2877fbcd2c4b2ebc951f2e23 (patch)
tree2844658e429e6ea795aed205c02e738ad8bfc668
parenta1b4a95c1b8fcaa26c3b1146b8e8e004a2844de6 (diff)
downloadrisu-18e5ed202b773d8a2877fbcd2c4b2ebc951f2e23.tar.gz
build-all-arches: include x86 triplets in the build
There are a couple of minor warts: - 32 bit x86 can be either i386-linux-gnu or i686-linux-gnu - skip looking for x86_64-linux-gnu-gcc in docker cross envs Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rwxr-xr-xbuild-all-archs10
1 files changed, 6 insertions, 4 deletions
diff --git a/build-all-archs b/build-all-archs
index a7cd7c2..e5dcfc8 100755
--- a/build-all-archs
+++ b/build-all-archs
@@ -39,7 +39,7 @@ while [[ "$1" = -* ]]; do
;;
--use-docker)
if [ -z "$arg" ]; then
- default_tags=$(docker images qemu --format "{{.Repository}}:{{.Tag}}" | grep "\(arm\|ppc64el\|m68k\).*cross$")
+ default_tags=$(docker images qemu --format "{{.Repository}}:{{.Tag}}" | grep "\(arm\|ppc64el\|m68k\|i386\).*cross$")
docker_tags=$(echo $default_tags | sed 's/\n/\s/g' )
else
docker_tags="$arg"
@@ -74,7 +74,7 @@ fi
DOCKER_RUN="docker run --rm -u $(id -u) -v $(pwd):$(pwd) -w $(pwd)"
program_exists() {
- if [ ! -z "$docker_tags" ]; then
+ if [[ ! -z "$docker_tags" && ! "$1" == "x86_64-linux-gnu-gcc" ]]; then
use_docker_tag=""
for tag in $docker_tags; do
if ${DOCKER_RUN} ${tag} /bin/bash -c "command -v $1 >/dev/null"; then
@@ -88,8 +88,10 @@ program_exists() {
}
# powerpc64-linux-gnu doesn't work at the moment, so not yet listed.
-for triplet in aarch64-linux-gnu arm-linux-gnueabihf m68k-linux-gnu \
- powerpc64le-linux-gnu powerpc64-linux-gnu ; do
+for triplet in i386-linux-gnu i686-linux-gnu x86_64-linux-gnu \
+ aarch64-linux-gnu arm-linux-gnueabihf \
+ m68k-linux-gnu \
+ powerpc64le-linux-gnu powerpc64-linux-gnu ; do
if ! program_exists "${triplet}-gcc"; then
echo "Skipping ${triplet}: no compiler found"