Use source-built jerbuild in CI
ober
9fffd4695a15a25b70c375f010a99458ba210c4c
--- a/.build.yml +++ b/.build.yml @@ -12,6 +12,7 @@ packages: - zip sources: - https://git.sr.ht/~lisp/jerboa-code + - https://git.sr.ht/~lisp/jerboa tasks: - setup-rust: | # jerboa's native FFI lib (libjerboa_native) is built with cargo and is @@ -21,6 +22,12 @@ tasks: # install one via rustup and persist it onto PATH for every later task. curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable echo 'source "$HOME/.cargo/env"' >> ~/.buildenv + - build-jerboa-tools: | + # The v0.2.0 Linux release jerbuild does not register libc strerror for + # one of its bundled stdlib imports. Build current jerbuild from source + # until the next release includes that static-symbol fix. + cd jerboa + make jerbuild - vendor-code: | cd jerboa-code mkdir -p vendor --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ JERBOA_TOOL_DIR ?= $(CURDIR)/.jerboa/bin JERBUILD ?= $(shell if [ -x ./jerbuild ] && [ -x ./jerboa ]; then echo ./jerbuild; \ elif [ -x "$(JERBOA_TOOL_DIR)/jerbuild" ] && [ -x "$(JERBOA_TOOL_DIR)/jerboa" ]; then echo "$(JERBOA_TOOL_DIR)/jerbuild"; \ elif [ -x ../jerboa/dist/jerbuild ] && [ -x ../jerboa/dist/jerboa ]; then echo ../jerboa/dist/jerbuild; \ + elif [ -x ../jerboa/jerbuild ]; then echo ../jerboa/jerbuild; \ elif command -v jerbuild >/dev/null 2>&1 && command -v jerboa >/dev/null 2>&1; then command -v jerbuild; \ else echo "$(JERBOA_TOOL_DIR)/jerbuild"; fi) @@ -88,6 +89,8 @@ ensure-jerboa-tools: echo "=== Using downloaded Jerboa toolchain: $(JERBOA_TOOL_DIR) ==="; \ elif [ -x ../jerboa/dist/jerbuild ] && [ -x ../jerboa/dist/jerboa ]; then \ echo "=== Using sibling Jerboa build: ../jerboa/dist/jerbuild ==="; \ + elif [ -x ../jerboa/jerbuild ]; then \ + echo "=== Using sibling Jerboa build: ../jerboa/jerbuild ==="; \ elif command -v jerbuild >/dev/null 2>&1 && command -v jerboa >/dev/null 2>&1; then \ echo "=== Using Jerboa toolchain from PATH: $$(command -v jerbuild) ==="; \ else \