Skip to content

Commit 3bf05a4

Browse files
authored
fix(policy): Fix env vars for building for arm64 (#14334)
Signed-off-by: Scott Fleener <[email protected]>
1 parent 20ec2f5 commit 3bf05a4

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

policy-controller/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,18 @@ ARG TARGETARCH
1212
# Install cross compiler toolchains
1313
RUN case "$TARGETARCH" in \
1414
amd64) true ;; \
15-
arm64) apt-get -y update && apt-get install --no-install-recommends -y gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu ;; \
15+
arm64) apt-get -y update && apt-get install --no-install-recommends -y binutils-aarch64-linux-gnu ;; \
1616
esac && rm -rf /var/lib/apt/lists/*
1717
# Enable tokio runtime metrics
1818
ENV RUSTFLAGS="--cfg tokio_unstable"
19-
ENV AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_gnu='-fuse-ld=/usr/aarch64-linux-gnu/bin/ld'
2019
RUN --mount=type=cache,target=target \
2120
--mount=type=cache,target=/usr/local/cargo/registry \
2221
target=$(case "$TARGETARCH" in \
2322
amd64) echo x86_64-unknown-linux-musl ;; \
2423
arm64) echo aarch64-unknown-linux-musl ;; \
2524
*) echo "unsupported architecture: $TARGETARCH" >&2; exit 1 ;; \
2625
esac) && \
27-
just-cargo profile=$BUILD_TYPE target=$target build --package=linkerd-policy-controller && \
26+
just-cargo CFLAGS_aarch64_unknown_linux_musl="" profile=$BUILD_TYPE target=$target build --package=linkerd-policy-controller && \
2827
mv "target/$target/$BUILD_TYPE/linkerd-policy-controller" /tmp/
2928

3029
FROM scratch AS runtime

0 commit comments

Comments
 (0)