Skip to content

Commit ae4e42a

Browse files
committed
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.
1 parent 58370e7 commit ae4e42a

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ RUN --mount=type=cache,from=apt-base,source=/etc/apt,target=/etc/apt,ro \
346346
DEBIAN_FRONTEND=noninteractive apt-get install -y \
347347
g++-aarch64-linux-gnu \
348348
gcc-aarch64-linux-gnu \
349+
binutils-aarch64-linux-gnu \
349350
libc6-dev-arm64-cross
350351

351352
##

bin/just-cargo

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ _rustflags-self-contained := "-Clink-self-contained=yes -Clinker=rust-lld -Clink
3434
export AR_aarch64_unknown_linux_gnu := _ar
3535
export CC_aarch64_unknown_linux_gnu := _clang
3636
export CFLAGS_aarch64_unknown_linux_gnu := '--sysroot=/usr/aarch64-linux-gnu'
37+
export AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_gnu := '-fuse-ld=/usr/aarch64-linux-gnu/bin/ld'
3738
export STRIP_aarch64_unknown_linux_gnu := _strip
3839
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER := 'aarch64-linux-gnu-gcc'
3940

4041
# linux/arm64 + musl
4142
export AR_aarch64_unknown_linux_musl := _ar
4243
export CC_aarch64_unknown_linux_musl := _clang
4344
export CFLAGS_aarch64_unknown_linux_musl := '--sysroot=/usr/aarch64-linux-gnu'
45+
export AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_musl := '-fuse-ld=/usr/aarch64-linux-gnu/bin/ld'
4446
export STRIP_aarch64_unknown_linux_musl := _strip
4547
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS := _rustflags-self-contained
4648

0 commit comments

Comments
 (0)