diff --git a/README.md b/README.md index 23b49a2..d4f1c0b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ ## Build the Docker container Example for AROSv1 x86_64 -docker build -t "amigadev/crosstools:x86_64-aros." --rm -f x86_64-aros.docker . +docker build -t "amigadev/crosstools:x86_64-aros" --rm -f x86_64-aros.docker . For other toolchains, use the appropriate Dockerfile: @@ -76,13 +76,13 @@ ### MorphOS example -it amigadev/crosstools:ppc-morphos bash ``` -### ArosV1 x86_64 example +### AROS (v1) x86_64 example ```bashS docker run --rm \ -v ${PWD}:/work \ -v /tmp/aros:/tmp/aros \ -e USER=$( id -u ) -e GROUP=$( id -g ) \ - -it aros:arosv1-cross-toolchain bash + -it amigadev/crosstools:x86_64-aros bash ``` * *${PWD}* is the current dir diff --git a/dependencies/toolchains b/dependencies/toolchains index a1395e7..43c5eff 160000 --- a/dependencies/toolchains +++ b/dependencies/toolchains @@ -1 +1 @@ -Subproject commit a1395e7201abb016728ef4ed5b474347be140e00 +Subproject commit 43c5eff7ee4a0249ab15345165127fee48eff270 diff --git a/x86_64-aros.docker b/x86_64-aros.docker index 41bd7f1..1f11b22 100644 --- a/x86_64-aros.docker +++ b/x86_64-aros.docker @@ -3,6 +3,8 @@ FROM amigadev/arosv1-cross-toolchain:x86_64 as build-env ENV CROSS_PFX x86_64-aros ENV CROSS_ROOT /opt/${CROSS_PFX} +COPY --from=build-env /opt/${CROSS_PFX} ./opt/${CROSS_PFX} + # START COMMON MAINTAINER Marlon Beijer "marlon@amigadev.com" @@ -14,12 +16,12 @@ COPY imagefiles/ccmake.sh /usr/local/bin/ccmake COPY imagefiles/entrypoint.sh /entry/ ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \ - LD=${CROSS_ROOT}/bin/${CROSS_PFX}-ld \ + LD=${CROSS_ROOT}/bin/${CROSS_PFX}-ld \ AR=${CROSS_ROOT}/bin/${CROSS_PFX}-ar \ CC=${CROSS_ROOT}/bin/${CROSS_PFX}-gcc \ CXX=${CROSS_ROOT}/bin/${CROSS_PFX}-g++ \ - RANLIB=${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib - + RANLIB=${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib + COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/ ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr