syndicate-lang
/
syndicate-rs
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Generalize target-stompling-avoidance originally only for docker

This commit is contained in:
Tony Garnock-Jones 2024-03-08 10:59:45 +01:00
parent b96c469ef5
commit eb9d9bed0f
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -32,7 +32,7 @@ pull-protocols:
static: static-x86_64 static: static-x86_64
static-%: static-%:
cross build --target $*-unknown-linux-musl --features vendored-openssl,jemalloc CARGO_TARGET_DIR=target/target.$* cross build --target $*-unknown-linux-musl --features vendored-openssl,jemalloc
########################################################################### ###########################################################################
@ -54,18 +54,18 @@ static-%:
x86_64-binary: x86_64-binary-release x86_64-binary: x86_64-binary-release
x86_64-binary-release: x86_64-binary-release:
cross build --target x86_64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc CARGO_TARGET_DIR=target/target.x86_64 cross build --target x86_64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc
x86_64-binary-debug: x86_64-binary-debug:
cross build --target x86_64-unknown-linux-musl --all-targets --features vendored-openssl CARGO_TARGET_DIR=target/target.x86_64 cross build --target x86_64-unknown-linux-musl --all-targets --features vendored-openssl
armv7-binary: armv7-binary-release armv7-binary: armv7-binary-release
armv7-binary-release: armv7-binary-release:
cross build --target=armv7-unknown-linux-musleabihf --release --all-targets --features vendored-openssl CARGO_TARGET_DIR=target/target.armv7 cross build --target=armv7-unknown-linux-musleabihf --release --all-targets --features vendored-openssl
armv7-binary-debug: armv7-binary-debug:
cross build --target=armv7-unknown-linux-musleabihf --all-targets --features vendored-openssl CARGO_TARGET_DIR=target/target.armv7 cross build --target=armv7-unknown-linux-musleabihf --all-targets --features vendored-openssl
# As of 2023-05-12 (and probably earlier!) this is no longer required with current Rust nightlies # As of 2023-05-12 (and probably earlier!) this is no longer required with current Rust nightlies
# # Hack to workaround https://github.com/rust-embedded/cross/issues/598 # # Hack to workaround https://github.com/rust-embedded/cross/issues/598
@ -74,7 +74,7 @@ armv7-binary-debug:
aarch64-binary: aarch64-binary-release aarch64-binary: aarch64-binary-release
aarch64-binary-release: aarch64-binary-release:
cross build --target=aarch64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc CARGO_TARGET_DIR=target/target.aarch64 cross build --target=aarch64-unknown-linux-musl --release --all-targets --features vendored-openssl,jemalloc
aarch64-binary-debug: aarch64-binary-debug:
cross build --target=aarch64-unknown-linux-musl --all-targets --features vendored-openssl CARGO_TARGET_DIR=target/target.aarch64 cross build --target=aarch64-unknown-linux-musl --all-targets --features vendored-openssl

5
docker/Makefile
View File

@ -10,7 +10,6 @@ all:
clean: clean:
rm -f syndicate-server.* rm -f syndicate-server.*
rm -rf $(patsubst %,target.%,$(ARCHITECTURES))
-podman images -q $(U)/$(I) | sort -u | xargs podman rmi -f -podman images -q $(U)/$(I) | sort -u | xargs podman rmi -f
image: $(SERVERS) image: $(SERVERS)
@ -34,5 +33,5 @@ push-only:
podman manifest push $(U)/$(I):latest podman manifest push $(U)/$(I):latest
syndicate-server.%: syndicate-server.%:
make -C .. CARGO_TARGET_DIR=docker/target.$* $$(./alpine-architecture $*)-binary-release make -C .. $$(./alpine-architecture $*)-binary-release
cp -a target.$*/$$(./alpine-architecture $*)-unknown-linux-musl*/release/syndicate-server $@ cp -a ../target/target.$$(./alpine-architecture $*)/$$(./alpine-architecture $*)-unknown-linux-musl*/release/syndicate-server $@