Merge pull request #305 from CosmWasm/musl-cross-builds

Add build system for musl Linux static libraries for aarch64

.circleci/config.yml

@@ -242,6 +242,7 @@ jobs:
           command: |
             mkdir artifacts
             cp ./api/libwasmvm_muslc.a artifacts
+            cp ./api/libwasmvm_muslc.aarch64.a artifacts
       - run:
           name: Create checksums
           working_directory: artifacts

Makefile

@@ -1,9 +1,9 @@
 .PHONY: all build build-rust build-go test
 
 # Builds the Rust library libwasmvm
-BUILDERS_PREFIX := cosmwasm/go-ext-builder:0009
+BUILDERS_PREFIX := cosmwasm/go-ext-builder:0010
 # Contains a full Go dev environment in order to run Go tests on the built library
-ALPINE_TESTER := cosmwasm/go-ext-builder:0009-alpine
+ALPINE_TESTER := cosmwasm/go-ext-builder:0010-alpine
 
 USER_ID := $(shell id -u)
 USER_GROUP = $(shell id -g)
@@ -60,7 +60,8 @@ release-build-alpine:
 	rm -rf libwasmvm/target/release
 	# build the muslc *.a file
 	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd)/libwasmvm:/code $(BUILDERS_PREFIX)-alpine
-	cp libwasmvm/target/release/examples/libmuslc.a api/libwasmvm_muslc.a
+	cp libwasmvm/artifacts/libwasmvm_muslc.a api
+	cp libwasmvm/artifacts/libwasmvm_muslc.aarch64.a api
 	make update-bindings
 	# try running go tests using this lib with muslc
 	docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/mnt/testrun -w /mnt/testrun $(ALPINE_TESTER) go build -tags muslc ./...

builders/Dockerfile.alpine

@@ -11,19 +11,26 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 # this comes from standard alpine nightly file
 #  https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
 # with some changes to support our toolchain, etc
-RUN set -eux; \
-    apk add --no-cache \
-    ca-certificates \
-    build-base;
-
-RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init"
-RUN chmod +x rustup-init
-RUN ./rustup-init -y --no-modify-path --default-toolchain 1.55.0; rm rustup-init
-RUN chmod -R a+w $RUSTUP_HOME $CARGO_HOME
-
-# needed for
-# /usr/lib/gcc/x86_64-alpine-linux-musl/9.3.0/../../../../x86_64-alpine-linux-musl/bin/ld: cannot find crti.o: No such file or directory
-ENV LIBRARY_PATH=/usr/local/rustup/toolchains/1.55.0-x86_64-unknown-linux-musl/lib/rustlib/x86_64-unknown-linux-musl/lib:$LIBRARY_PATH
+RUN set -eux \
+    && apk add --no-cache ca-certificates build-base
+
+RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init" \
+  && chmod +x rustup-init \
+  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.55.0 \
+  && rm rustup-init \
+  && chmod -R a+w $RUSTUP_HOME $CARGO_HOME
+
+# 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.
+# For newer versions this might not be needed anymore since build.rs is removed
+# in https://github.com/wasmerio/wasmer/pull/2807.
+#
+# https://unix.stackexchange.com/questions/620205/aarch64-linux-musl-cross-has-a-broken-link-for-ld-musl-aarch64-so-1
+RUN wget https://musl.cc/aarch64-linux-musl-cross.tgz \
+  && tar -xf aarch64-linux-musl-cross.tgz \
+  && mv ./aarch64-linux-musl-cross /opt \
+  && /opt/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc --version \
+  && rm aarch64-linux-musl-cross.tgz
 
 # prepare go cache dirs
 RUN mkdir -p /.cache/go-build
@@ -35,6 +42,9 @@ RUN chmod -R 777 /usr/local/cargo
 ## COPY BUILD SCRIPTS
 WORKDIR /code
 
+# Add musl Rust targets
+RUN rustup target add aarch64-unknown-linux-musl x86_64-unknown-linux-musl
+
 COPY guest/*.sh /opt/
 RUN chmod +x /opt/*.sh
 

builders/Dockerfile.centos7

@@ -10,7 +10,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 
 RUN wget "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init" \
   && chmod +x rustup-init \
-  && ./rustup-init -y --no-modify-path --default-toolchain 1.55.0 \
+  && ./rustup-init -y --no-modify-path --profile minimal --default-toolchain 1.55.0 \
   && rm rustup-init \
   && chmod -R a+w $RUSTUP_HOME $CARGO_HOME \
   && rustup --version \

builders/Makefile

@@ -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/go-ext-builder:0009
+BUILDERS_PREFIX := cosmwasm/go-ext-builder:0010
 
 .PHONY: docker-image-centos7
 docker-image-centos7:
@@ -22,3 +22,9 @@ docker-publish: docker-images
 	docker push $(BUILDERS_PREFIX)-cross
 	docker push $(BUILDERS_PREFIX)-centos7
 	docker push $(BUILDERS_PREFIX)-alpine
+
+.PHONY: pull-base-images
+pull-base-images:
+	docker pull golang:1.17.7-alpine
+	docker pull centos:centos7
+	docker pull rust:1.55.0-bullseye

builders/README.md

@@ -14,6 +14,11 @@ can do the cross-compilation.
 
 ## Changelog
 
+**Version 0010:**
+
+- Add cross-compilation setup to build `libwasmvm_muslc.a` and `libwasmvm_muslc.aarch64.a`
+  from the alpine builder image.
+
 **Version 0009:**
 
 - Let macOS build dylib files with both aarch64 and x86_64 code.

builders/guest/build_muslc.sh

@@ -1,6 +1,16 @@
 #!/bin/sh
+set -e # Note we are not using bash here but the Alpine default shell
 
 # See https://github.com/CosmWasm/wasmvm/issues/222#issuecomment-880616953 for two approaches to
 # enable stripping through cargo (if that is desired).
 
-cargo build --release --example muslc
+echo "Starting aarch64-unknown-linux-musl build"
+export CC=/opt/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
+cargo build --release --target aarch64-unknown-linux-musl --example muslc
+unset CC
+
+echo "Starting x86_64-unknown-linux-musl build"
+cargo build --release --target x86_64-unknown-linux-musl --example muslc
+
+cp target/aarch64-unknown-linux-musl/release/examples/libmuslc.a artifacts/libwasmvm_muslc.aarch64.a
+cp target/x86_64-unknown-linux-musl/release/examples/libmuslc.a artifacts/libwasmvm_muslc.a