From ae4e42a5fc578c534e00bafc466f48cf06635420 Mon Sep 17 00:00:00 2001 From: Scott Fleener Date: Fri, 1 Aug 2025 14:54:47 -0400 Subject: [PATCH 1/2] fix: Setup devcontainers for building aws-lc-sys This needs a few environment variables and debian packages installed to facilitate building that package. This includes the env vars in the `just-cargo` invocation, and the packages in the rust, rust-musl, and devcontainer images. --- Dockerfile | 1 + bin/just-cargo | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 3227cc8..a8de00e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -346,6 +346,7 @@ RUN --mount=type=cache,from=apt-base,source=/etc/apt,target=/etc/apt,ro \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ g++-aarch64-linux-gnu \ gcc-aarch64-linux-gnu \ + binutils-aarch64-linux-gnu \ libc6-dev-arm64-cross ## diff --git a/bin/just-cargo b/bin/just-cargo index d052ce8..3a0be34 100755 --- a/bin/just-cargo +++ b/bin/just-cargo @@ -34,6 +34,7 @@ _rustflags-self-contained := "-Clink-self-contained=yes -Clinker=rust-lld -Clink export AR_aarch64_unknown_linux_gnu := _ar export CC_aarch64_unknown_linux_gnu := _clang export CFLAGS_aarch64_unknown_linux_gnu := '--sysroot=/usr/aarch64-linux-gnu' +export AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_gnu := '-fuse-ld=/usr/aarch64-linux-gnu/bin/ld' export STRIP_aarch64_unknown_linux_gnu := _strip export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER := 'aarch64-linux-gnu-gcc' @@ -41,6 +42,7 @@ export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER := 'aarch64-linux-gnu-gcc' export AR_aarch64_unknown_linux_musl := _ar export CC_aarch64_unknown_linux_musl := _clang export CFLAGS_aarch64_unknown_linux_musl := '--sysroot=/usr/aarch64-linux-gnu' +export AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_musl := '-fuse-ld=/usr/aarch64-linux-gnu/bin/ld' export STRIP_aarch64_unknown_linux_musl := _strip export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS := _rustflags-self-contained From bc0421e93415567b03dbdef9238a4ae3fae67fc3 Mon Sep 17 00:00:00 2001 From: Scott Fleener Date: Thu, 7 Aug 2025 16:08:00 -0400 Subject: [PATCH 2/2] fix: Remove CFLAGS from just-cargo --- bin/just-cargo | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bin/just-cargo b/bin/just-cargo index 3a0be34..24f2c3d 100755 --- a/bin/just-cargo +++ b/bin/just-cargo @@ -33,16 +33,12 @@ _rustflags-self-contained := "-Clink-self-contained=yes -Clinker=rust-lld -Clink # linux/arm64 + gnu export AR_aarch64_unknown_linux_gnu := _ar export CC_aarch64_unknown_linux_gnu := _clang -export CFLAGS_aarch64_unknown_linux_gnu := '--sysroot=/usr/aarch64-linux-gnu' -export AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_gnu := '-fuse-ld=/usr/aarch64-linux-gnu/bin/ld' export STRIP_aarch64_unknown_linux_gnu := _strip export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER := 'aarch64-linux-gnu-gcc' # linux/arm64 + musl export AR_aarch64_unknown_linux_musl := _ar export CC_aarch64_unknown_linux_musl := _clang -export CFLAGS_aarch64_unknown_linux_musl := '--sysroot=/usr/aarch64-linux-gnu' -export AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_musl := '-fuse-ld=/usr/aarch64-linux-gnu/bin/ld' export STRIP_aarch64_unknown_linux_musl := _strip export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS := _rustflags-self-contained