diff --git a/Cross.toml b/Cross.toml index 5cf503bfa..b0a2ef2a0 100644 --- a/Cross.toml +++ b/Cross.toml @@ -15,6 +15,13 @@ pre-build = [ "apt-get update && apt-get install --assume-yes --no-install-recommends llvm-dev libclang-dev clang", ] +# Use specific Docker images for Linux targets to avoid GLIBC compatibility issues +[target.x86_64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:0.2.5" + +[target.aarch64-unknown-linux-gnu] +image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:0.2.5" + [target.x86_64-pc-windows-gnu] # Why do we need a custom Dockerfile on Windows: # 1. `reth-libmdbx` stopped working with MinGW 9.3 that cross image comes with. diff --git a/Makefile b/Makefile index 97eef6403..7919afb73 100644 --- a/Makefile +++ b/Makefile @@ -236,6 +236,7 @@ build-x86_64-pc-windows-gnu: FEATURES := $(filter-out jemalloc jemalloc-prof,$(F build-%: RUSTFLAGS="-C link-arg=-lgcc -Clink-arg=-static-libgcc" \ cross build --bin reth-hl --target $* --features "$(FEATURES)" --profile "$(PROFILE)" + ##@ Docker # Note: This requires a buildx builder with emulation support. For example: