Skip to content

Fix builders #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 13, 2025
Merged

Fix builders #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7446927
Fix builders
chipshort Feb 13, 2025
cc7a3ec
Bump builder version in docs
chipshort Feb 13, 2025
aac14cb
Remove unnecessary arguments in Makefile
chipshort Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Builds the Rust library libwasmvm
BUILDERS_PREFIX := cosmwasm/libwasmvm-builder:0102
BUILDERS_PREFIX := cosmwasm/libwasmvm-builder:0103
# Contains a full Go dev environment including CGO support in order to run Go tests on the built shared library
# This image is currently not published.
ALPINE_TESTER := cosmwasm/alpine-tester:local
Expand Down
2 changes: 1 addition & 1 deletion builders/Dockerfile.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM --platform=linux/amd64 rust:1.82.0-alpine

RUN apk add --no-cache ca-certificates build-base
RUN apk add --no-cache ca-certificates build-base llvm17-dev clang17-static

# Install C compiler for cross-compilation. This is required by
# Wasmer in https://github.com/wasmerio/wasmer/blob/2.2.1/lib/vm/build.rs.
Expand Down
2 changes: 1 addition & 1 deletion builders/Dockerfile.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
FROM --platform=linux/amd64 debian:11-slim

RUN apt update -y \
&& apt install -y gcc make gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu wget
&& apt install -y gcc make gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu wget clang

# GET FROM https://github.com/rust-lang/docker-rust-nightly
ENV RUSTUP_HOME=/usr/local/rustup \
Expand Down
2 changes: 1 addition & 1 deletion builders/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Versioned by a simple counter that is not bound to a specific CosmWasm version
# See builders/README.md
BUILDERS_PREFIX := cosmwasm/libwasmvm-builder:0102
BUILDERS_PREFIX := cosmwasm/libwasmvm-builder:0103

.PHONY: docker-image-debian
docker-image-debian:
Expand Down
2 changes: 0 additions & 2 deletions builders/guest/build_gnu_aarch64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ export TARGET_DIR="/target" # write to /target in the guest's file system to avo
# No stripping implemented (see https://github.com/CosmWasm/wasmvm/issues/222#issuecomment-2260007943).

echo "Starting aarch64-unknown-linux-gnu build"
export CC=clang
export CXX=clang++
export qemu_aarch64="qemu-aarch64 -L /usr/aarch64-linux-gnu"
export CC_aarch64_unknown_linux_gnu=clang
export AR_aarch64_unknown_linux_gnu=llvm-ar
Expand Down
3 changes: 1 addition & 2 deletions builders/guest/build_muslc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ export TARGET_DIR="/target" # write to /target in the guest's file system to avo
# No stripping implemented (see https://github.com/CosmWasm/wasmvm/issues/222#issuecomment-2260007943).

echo "Starting aarch64-unknown-linux-musl build"
export CC=/opt/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
export CC_aarch64_unknown_linux_musl=/opt/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
cargo build --release --target-dir="$TARGET_DIR" --target aarch64-unknown-linux-musl --example wasmvmstatic
unset CC

echo "Starting x86_64-unknown-linux-musl build"
cargo build --release --target-dir="$TARGET_DIR" --target x86_64-unknown-linux-musl --example wasmvmstatic
Expand Down
4 changes: 2 additions & 2 deletions docs/COMPILER_VERSIONS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ We currently use the following version:

| Type | Rust version | Note |
| ------------------------ | ------------ | --------------------------------- |
| Production Rust compiler | 1.82.0 | Builders version 0102 |
| Min Rust compiler | 1.82.0 | Supports builder versions >= 0102 |
| Production Rust compiler | 1.82.0 | Builders version 0103 |
| Min Rust compiler | 1.82.0 | Supports builder versions >= 0103 |
| Tooling Rust compiler | 1.81.0 | |