Skip to content

Commit b34ee1e

Browse files
bors[bot]kaspar030
andauthored
Merge #229
229: add ld-memory r=kaspar030 a=kaspar030 This adds [ld-memory](https://github.com/kaspar030/ld-memory), a utility I wrote that creates GNU ld MEMORY sections from command line parameters. Needed for RIOT-OS/RIOT#19692. (adds ~800kB to the image) Co-authored-by: Kaspar Schleiser <[email protected]>
2 parents 3b18ad8 + b772adc commit b34ee1e

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

riotbuild/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,10 @@ RUN \
364364
echo 'Cleaning up root-owned crates.io cache' >&2 && \
365365
rm -rf /opt/rustup/.cargo/{git,registry,.package-cache}
366366

367+
# get ld-memory from pre-built containers (ld-memory is used for on-the-fly
368+
# .ld linker script generation)
369+
COPY --from=kaspar030/ld-memory:0.2 /ld-memory /usr/bin/ld-memory
370+
367371
# get Dockerfile version from build args
368372
ARG RIOTBUILD_VERSION=unknown
369373
ENV RIOTBUILD_VERSION $RIOTBUILD_VERSION

0 commit comments

Comments
 (0)