diff options
Diffstat (limited to '.gitlab-ci/debian-install.sh')
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 8a74b2877da..774b8e02128 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -5,7 +5,7 @@ set -o xtrace export DEBIAN_FRONTEND=noninteractive -CROSS_ARCHITECTURES="armhf arm64 i386" +CROSS_ARCHITECTURES="i386" for arch in $CROSS_ARCHITECTURES; do dpkg --add-architecture $arch done @@ -216,9 +216,11 @@ for arch in $CROSS_ARCHITECTURES; do /usr/share/meson/debcrossgen --arch "$arch" -o "$cross_file" # Explicitly set ccache path for cross compilers sed -i "s|/usr/bin/\([^-]*\)-linux-gnu\([^-]*\)-g|/usr/lib/ccache/\\1-linux-gnu\\2-g|g" "$cross_file" - # Work around a bug in debcrossgen that should be fixed in the next release if [ "$arch" = "i386" ]; then + # Work around a bug in debcrossgen that should be fixed in the next release sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" "$cross_file" + # Don't need wrapper for i386 executables + sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file" fi done |