Update CI for new QBE Makefile

8 files changed, 12 insertions, 18 deletions

diff --git a/.builds/alpine-aarch64.yml b/.builds/alpine-aarch64.yml
index cb9e345..df1bb97 100644
--- a/.builds/alpine-aarch64.yml
+++ b/.builds/alpine-aarch64.yml
@@ -4,7 +4,7 @@ packages:
 - qemu-openrc
 sources:
 - https://git.sr.ht/~mcf/cproc
-- https://git.sr.ht/~mcf/qbe
+- git://c9x.me/qbe.git
 tasks:
 - setup: |
     # work around bugs in qemu-binfmt
@@ -13,7 +13,7 @@ tasks:
     curl -O http://musl.cc/aarch64-linux-musl-cross.tgz
     tar --warning=no-unknown-keyword -xzf aarch64-linux-musl-cross.tgz
 - build: |
-    PATH=$HOME/qbe/obj:$HOME/aarch64-linux-musl-cross/bin:$PATH
+    PATH=$HOME/qbe:$HOME/aarch64-linux-musl-cross/bin:$PATH
     cd qbe
     cat >config.h <<EOF
     #define Defasm Gaself
diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index e23dff6..23d2f6f 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -7,7 +7,7 @@ sources:
 - git://c9x.me/qbe.git
 tasks:
 - build: |
-    PATH=$HOME/qbe/obj:$PATH
+    PATH=$HOME/qbe:$PATH
     make -C qbe
     cd cproc
     ./configure
diff --git a/.builds/debian-aarch64.yml b/.builds/debian-aarch64.yml
index 4d8c7b0..2b37e0d 100644
--- a/.builds/debian-aarch64.yml
+++ b/.builds/debian-aarch64.yml
@@ -9,7 +9,7 @@ sources:
 - https://git.sr.ht/~mcf/qbe
 tasks:
 - build: |
-    PATH=$HOME/qbe/obj:$PATH
+    PATH=$HOME/qbe:$PATH
     cd qbe
     cat >config.h <<EOF
     #define Defasm Gaself
diff --git a/.builds/debian.yml b/.builds/debian.yml
index e4a4b55..2bb9161 100644
--- a/.builds/debian.yml
+++ b/.builds/debian.yml
@@ -4,7 +4,7 @@ sources:
 - git://c9x.me/qbe.git
 tasks:
 - build: |
-    PATH=$HOME/qbe/obj:$PATH
+    PATH=$HOME/qbe:$PATH
     make -C qbe
     cd cproc
     ./configure
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 65a0f36..0610945 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -2,12 +2,10 @@ image: freebsd/12.x
 sources:
 - https://git.sr.ht/~mcf/cproc
 - git://c9x.me/qbe.git
-packages:
-- gmake
 tasks:
 - build: |
-    PATH=$HOME/qbe/obj:$PATH
-    gmake -C qbe
+    PATH=$HOME/qbe:$PATH
+    make -C qbe
     cd cproc
     ./configure
     make all check bootstrap
diff --git a/.builds/netbsd.yml b/.builds/netbsd.yml
index bb9c20b..577179b 100644
--- a/.builds/netbsd.yml
+++ b/.builds/netbsd.yml
@@ -2,14 +2,12 @@ image: netbsd/latest
 sources:
 - https://git.sr.ht/~mcf/cproc
 - git://c9x.me/qbe.git
-packages:
-- gmake
 tasks:
 - setup: |
     sudo patch -p1 -d /usr/include < cproc/.builds/netbsd.diff
 - build: |
-    PATH=$HOME/qbe/obj:$PATH
-    gmake -C qbe
+    PATH=$HOME/qbe:$PATH
+    make -C qbe
     cd cproc
     ./configure
     make all check bootstrap
diff --git a/.builds/nixos.yml b/.builds/nixos.yml
index 1f7b234..4eee0e7 100644
--- a/.builds/nixos.yml
+++ b/.builds/nixos.yml
@@ -9,7 +9,7 @@ packages:
 - nixpkgs.gnumake
 tasks:
 - build: |
-    PATH=$HOME/qbe/obj:$PATH
+    PATH=$HOME/qbe:$PATH
     make -C qbe
     cd cproc
     ./configure --with-ldso=
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index a3e8811..c7abb32 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -2,15 +2,13 @@ image: openbsd/latest
 sources:
 - https://git.sr.ht/~mcf/cproc
 - git://c9x.me/qbe.git
-packages:
-- gmake
 tasks:
 - setup: |
     # avoid __asm__ on non __GNUC__ compilers
     doas patch -d /usr/include < cproc/.builds/openbsd.diff
 - build: |
-    PATH=$HOME/qbe/obj:$PATH
-    gmake -C qbe
+    PATH=$HOME/qbe:$PATH
+    make -C qbe
     cd cproc
     ./configure
     make all check bootstrap