diff options
| author | Michael Forney <mforney@mforney.org> | 2019-11-17 19:53:15 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2019-11-17 19:53:15 -0800 |
| commit | 8db73edd61b1d4fbb2c2de62fb1b55c616ac7054 (patch) | |
| tree | 5c279cfbc98de9673598d58e6d1e84ed30ccb23a | |
| parent | 0d66a4518f9e9ce3d029c14ed01d6bb7beeee437 (diff) | |
| download | cproc-8db73edd61b1d4fbb2c2de62fb1b55c616ac7054.tar.xz | |
Fix build manifests for changed environment behavior
| -rw-r--r-- | .builds/alpine-aarch64.yml | 3 | ||||
| -rw-r--r-- | .builds/alpine.yml | 3 | ||||
| -rw-r--r-- | .builds/debian-aarch64.yml | 3 | ||||
| -rw-r--r-- | .builds/debian.yml | 3 | ||||
| -rw-r--r-- | .builds/freebsd.yml | 3 | ||||
| -rw-r--r-- | .builds/nixos.yml | 3 | ||||
| -rw-r--r-- | .builds/openbsd.yml | 3 |
7 files changed, 7 insertions, 14 deletions
diff --git a/.builds/alpine-aarch64.yml b/.builds/alpine-aarch64.yml index 93d3236..8c5d199 100644 --- a/.builds/alpine-aarch64.yml +++ b/.builds/alpine-aarch64.yml @@ -5,8 +5,6 @@ packages: sources: - https://git.sr.ht/~mcf/cproc - https://git.sr.ht/~mcf/qbe -environment: - PATH: $HOME/qbe/obj:$HOME/aarch64-linux-musl-cross/bin:$PATH tasks: - setup: | # work around bugs in qemu-binfmt @@ -15,6 +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 cd qbe cat >config.h <<EOF #define Defasm Gaself diff --git a/.builds/alpine.yml b/.builds/alpine.yml index 637d90a..7a81b31 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -8,10 +8,9 @@ sources: - https://git.sr.ht/~sircmpwn/annotatec secrets: - cd4f74b3-9b4f-435f-b747-e513ba03f947 -environment: - PATH: $HOME/qbe/obj:$PATH tasks: - build: | + PATH=$HOME/qbe/obj:$PATH make -C qbe cd cproc ./configure diff --git a/.builds/debian-aarch64.yml b/.builds/debian-aarch64.yml index 9b991bb..5326844 100644 --- a/.builds/debian-aarch64.yml +++ b/.builds/debian-aarch64.yml @@ -5,10 +5,9 @@ packages: sources: - https://git.sr.ht/~mcf/cproc - https://git.sr.ht/~mcf/qbe -environment: - PATH: $HOME/qbe/obj:$PATH tasks: - build: | + PATH=$HOME/qbe/obj:$PATH cd qbe cat >config.h <<EOF #define Defasm Gaself diff --git a/.builds/debian.yml b/.builds/debian.yml index 84530d1..5ac2e96 100644 --- a/.builds/debian.yml +++ b/.builds/debian.yml @@ -2,10 +2,9 @@ image: debian/stretch sources: - https://git.sr.ht/~mcf/cproc - git://c9x.me/qbe.git -environment: - PATH: $HOME/qbe/obj:$PATH tasks: - build: | + PATH=$HOME/qbe/obj:$PATH make -C qbe cd cproc ./configure diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index f621f76..cbc689e 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -4,10 +4,9 @@ sources: - git://c9x.me/qbe.git packages: - gmake -environment: - PATH: $HOME/qbe/obj:$PATH tasks: - build: | + PATH=$HOME/qbe/obj:$PATH gmake -C qbe cd cproc ./configure diff --git a/.builds/nixos.yml b/.builds/nixos.yml index afd80db..f7f9a62 100644 --- a/.builds/nixos.yml +++ b/.builds/nixos.yml @@ -7,10 +7,9 @@ repositories: packages: - nixpkgs.gcc - nixpkgs.gnumake -environment: - PATH: $HOME/qbe/obj:$PATH tasks: - build: | + PATH=$HOME/qbe/obj:$PATH make -C qbe cd cproc ./configure --with-ldso= diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index 0059992..f5d9cd9 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -4,13 +4,12 @@ sources: - git://c9x.me/qbe.git packages: - gmake -environment: - PATH: $HOME/qbe/obj:$PATH tasks: - setup: | # avoid __asm__ on non __GNUC__ compilers doas patch -d /usr/include/amd64 < cproc/.builds/openbsd.diff - build: | + PATH=$HOME/qbe/obj:$PATH gmake -C qbe cd cproc ./configure |