From ebfcd33fdecc76ad49521bbfe7b86b65a5f344c2 Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Sat, 18 Nov 2023 00:37:31 -0800 Subject: [PATCH] fix gcc prefix --- packages/gcc/Dockerfile | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/packages/gcc/Dockerfile b/packages/gcc/Dockerfile index 27acba9..f44a315 100644 --- a/packages/gcc/Dockerfile +++ b/packages/gcc/Dockerfile @@ -15,18 +15,29 @@ RUN set -ex; \ RUN set -ex; \ ./configure \ - --build="x86_64-linux-musl" \ - --host="x86_64-linux-musl" \ + --target=x86_64-linux-musl \ + --build=x86_64-linux-musl \ + --host=x86_64-linux-musl \ + --prefix /usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-cet \ + --disable-fixed-point \ + --disable-libstdcxx-pch \ --disable-multilib \ + --disable-nls \ + --disable-werror \ + --enable-__cxa_atexit \ + --enable-default-pie \ + --enable-default-ssp \ --enable-languages=c,c++ \ - --prefix /rootfs \ - ; \ - make -j "$(nproc)"; \ - make install-strip -COPY --from=musl /lib /libmusl -RUN mv /libmusl/* /rootfs/lib/ + --enable-link-serialization=2 \ + --enable-linker-build-id; \ + make -j "$(nproc)" +RUN make DESTDIR=/home/user/rootfs/ install-strip +COPY --from=musl /lib/* /home/user/rootfs/lib/ FROM scratch -COPY --from=build /rootfs / -ENTRYPOINT ["/bin/gcc"] +COPY --from=build /home/user/rootfs / +ENTRYPOINT ["/usr/bin/gcc"] CMD ["--version"]