From 6b107f33b5956bd4a1eca628426c4d7020271a0a Mon Sep 17 00:00:00 2001 From: Ikey Doherty Date: Tue, 10 Oct 2017 20:29:13 +0100 Subject: [PATCH] Ensure we can build everything now. Signed-off-by: Ikey Doherty --- .gitignore | 2 +- mkgobuildy.sh | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3d5856a..cf2cf38 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ m4/*.m4 /lsi-settings -/build/ +/buildroot/ diff --git a/mkgobuildy.sh b/mkgobuildy.sh index ed97a02..122f37e 100755 --- a/mkgobuildy.sh +++ b/mkgobuildy.sh @@ -1,7 +1,13 @@ #!/bin/bash +set -e + +CC="gcc -m32" linux32 meson buildroot/build32 --prefix=/usr --sysconfdir=/etc --datadir=/usr/share --libdir=/usr/lib32 +meson buildroot/build64 --prefix=/usr --sysconfdir=/etc --datadir=/usr/share --libdir=/usr/lib64 + +ninja -C buildroot/build32 +ninja -C buildroot/build64 + +DESTDIR=`pwd`/buildroot/install ninja -C buildroot/build32 install +DESTDIR=`pwd`/buildroot/install ninja -C buildroot/build64 install -linux32 meson build32 --prefix=/usr --sysconfdir=/etc --datadir=/usr/share --libdir=/usr/lib32 CC="gcc -m32" -meson build64 --prefix=/usr --sysconfdir=/etc --datadir=/usr/share --libdir=/usr/lib64 -ninja -C build32 -ninja -C build64