From 4e20b2744369b4d520b570a62971ab7a8721e54f Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon@eevul.org>
Date: Fri, 18 Oct 2019 03:09:22 +0200
Subject: [PATCH 01/13] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a97c42b..b1015c9 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Platform | Toolchain | Supported
 ------------ | ------------ | -------------
 AmigaOS 3.x | @bebbo toolchain - gcc 6 | **Yes**
 AmigaOS 4.x | @sba1 adtools - gcc 8 | **Yes**
-MorphOS 3.9+ | MorphOS Team (un)official tools - gcc 6 | **Yes**
+MorphOS 3.9+ | MorphOS Team SDK 3.14 - gcc 9 | **Yes**
 ~WarpOS~ | ~gcc 6~ | Not yet
 ~AROS ABIv1 x86_64~ | ~AROS Team Official - gcc 9~ | Not yet
 ~AROS ABIv1 x86~ | ~AROS Team Official - gcc 9~ | Not yet

From 81ad5e327fbd19dbafb556e998be108fdad351b1 Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon.beijer@cybercom.com>
Date: Wed, 6 Nov 2019 17:47:02 +0100
Subject: [PATCH 02/13] Make it so gcc, g++, and binutils can be accessed
 without prefixed names Try to make images smaller Update submodule

---
 dependencies/toolchains |  2 +-
 m68k-amigaos.docker     | 25 ++++++++++++++-----------
 ppc-amigaos.docker      | 19 ++++++++++++-------
 ppc-morphos.docker      | 19 ++++++++++++-------
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/dependencies/toolchains b/dependencies/toolchains
index 43c5eff..bd9ff9f 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit 43c5eff7ee4a0249ab15345165127fee48eff270
+Subproject commit bd9ff9f70cad4d1f8bae218a92b56a8b3252a22b
diff --git a/m68k-amigaos.docker b/m68k-amigaos.docker
index 110f5d6..7b3605b 100644
--- a/m68k-amigaos.docker
+++ b/m68k-amigaos.docker
@@ -5,18 +5,14 @@ FROM amigadev/docker-base:latest
 ENV CROSS_PFX m68k-amigaos
 
 # Temporary fix
-COPY --from=build-env /opt/amiga /opt/amiga
-RUN ln -s /opt/amiga /opt/${CROSS_PFX}
-
+COPY --from=build-env /opt/amiga /opt/${CROSS_PFX}
+RUN ln -s /opt/${CROSS_PFX} /opt/amiga 
 
 # START COMMON
 MAINTAINER Marlon Beijer "marlon@amigadev.com"
-
-RUN apt-get update && apt-get install -y apt-utils cmake wget curl git make automake autoconf pkg-config lhasa unzip gcc-multilib libtool 
+RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y
 RUN echo "root:root" | chpasswd
-
 RUN ln -s /opt/${CROSS_PFX} /tools
-
 ENV CROSS_ROOT /opt/${CROSS_PFX}
 
 WORKDIR /work
@@ -28,11 +24,18 @@ COPY imagefiles/entrypoint.sh /entry/
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
 	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++ \
+	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
-	
+
+RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ar /usr/bin/ar && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ld /usr/bin/ld && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-gcc /usr/bin/gcc && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-g++ /usr/bin/g++ && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/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
diff --git a/ppc-amigaos.docker b/ppc-amigaos.docker
index 7981ca8..6469704 100644
--- a/ppc-amigaos.docker
+++ b/ppc-amigaos.docker
@@ -9,11 +9,9 @@ COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
 # START COMMON
 MAINTAINER Marlon Beijer "marlon@amigadev.com"
 
-RUN apt-get update && apt-get install -y cmake wget curl git make automake autoconf pkg-config lhasa unzip gcc-multilib libtool 
+RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y
 RUN echo "root:root" | chpasswd
-
 RUN ln -s /opt/${CROSS_PFX} /tools
-
 ENV CROSS_ROOT /opt/${CROSS_PFX}
 
 WORKDIR /work
@@ -25,11 +23,18 @@ COPY imagefiles/entrypoint.sh /entry/
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
 	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++ \
+	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
-	
+
+RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ar /usr/bin/ar && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ld /usr/bin/ld && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-gcc /usr/bin/gcc && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-g++ /usr/bin/g++ && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/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
diff --git a/ppc-morphos.docker b/ppc-morphos.docker
index c71cf13..9fee5ff 100644
--- a/ppc-morphos.docker
+++ b/ppc-morphos.docker
@@ -9,11 +9,9 @@ COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
 # START COMMON
 MAINTAINER Marlon Beijer "marlon@amigadev.com"
 
-RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y cmake wget curl git make automake autoconf pkg-config lhasa unzip gcc-multilib libtool libc6:i386 libstdc++6:i386
+RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y
 RUN echo "root:root" | chpasswd
-
 RUN ln -s /opt/${CROSS_PFX} /tools
-
 ENV CROSS_ROOT /opt/${CROSS_PFX}
 
 WORKDIR /work
@@ -25,11 +23,18 @@ COPY imagefiles/entrypoint.sh /entry/
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
 	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++ \
+	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
-	
+
+RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ar /usr/bin/ar && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ld /usr/bin/ld && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-gcc /usr/bin/gcc && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-g++ /usr/bin/g++ && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/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

From a79403c7720e565c69ee5f0b91b4c27d618554c0 Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon@eevul.org>
Date: Mon, 27 Jan 2020 15:57:55 +0100
Subject: [PATCH 03/13] Sebastian Bergmann doesn't have time to maintain his
 docker image anymore, so we're taking over

---
 m68k-amigaos.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m68k-amigaos.docker b/m68k-amigaos.docker
index 7b3605b..15411ab 100644
--- a/m68k-amigaos.docker
+++ b/m68k-amigaos.docker
@@ -1,4 +1,4 @@
-FROM sebastianbergmann/amiga-gcc:latest as build-env
+FROM amigadev/m68k-amigaos-gcc:latest as build-env
 
 FROM amigadev/docker-base:latest
 

From ca6242b37c167a88cc5fab114e001fd3198089b0 Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon@eevul.org>
Date: Wed, 5 Feb 2020 15:31:45 +0100
Subject: [PATCH 04/13] Fix pthread issue in ppc-morphos toolchain

---
 dependencies/toolchains | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies/toolchains b/dependencies/toolchains
index bd9ff9f..5699fb6 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit bd9ff9f70cad4d1f8bae218a92b56a8b3252a22b
+Subproject commit 5699fb674c52ec8e26bf8a4adce3482721c8e968

From ee79a2b69ef442ab11b76f54c3a315e941582e74 Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon.beijer@cybercom.com>
Date: Thu, 6 Feb 2020 17:35:27 +0100
Subject: [PATCH 05/13] Add support for VASM compiler dialect in m68k-toolchain

---
 dependencies/toolchains | 2 +-
 m68k-amigaos.docker     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dependencies/toolchains b/dependencies/toolchains
index 5699fb6..815e31d 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit 5699fb674c52ec8e26bf8a4adce3482721c8e968
+Subproject commit 815e31dba5ab49dbf337f7923bd25394e8a1b597
diff --git a/m68k-amigaos.docker b/m68k-amigaos.docker
index 15411ab..01d7b09 100644
--- a/m68k-amigaos.docker
+++ b/m68k-amigaos.docker
@@ -37,6 +37,8 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
 	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib
 
 COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
+COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
+RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
 ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
 ENV PATH ${PATH}:${CROSS_ROOT}/bin

From 69aeeeba4271298d49ed972accb8707d63321120 Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon.beijer@cybercom.com>
Date: Thu, 6 Feb 2020 17:56:19 +0100
Subject: [PATCH 06/13] Update submodule

---
 dependencies/toolchains | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies/toolchains b/dependencies/toolchains
index 815e31d..45004ee 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit 815e31dba5ab49dbf337f7923bd25394e8a1b597
+Subproject commit 45004ee2343980ba178934174580a4344926ca30

From 71230579b9ba27e5c2b561b8326879a59ffaa7dd Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon.beijer@cybercom.com>
Date: Thu, 6 Feb 2020 18:11:32 +0100
Subject: [PATCH 07/13] Update submodule

---
 dependencies/toolchains | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies/toolchains b/dependencies/toolchains
index 45004ee..6b8d3ce 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit 45004ee2343980ba178934174580a4344926ca30
+Subproject commit 6b8d3ced2b8a0cf1bf51256efb46617d45437207

From f042b4a5498bd050fc5d6d53e1be8431cdd99aed Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon@eevul.org>
Date: Sat, 8 Feb 2020 04:44:01 +0100
Subject: [PATCH 08/13] Update m68k-amigaos.docker

---
 m68k-amigaos.docker | 1 +
 1 file changed, 1 insertion(+)

diff --git a/m68k-amigaos.docker b/m68k-amigaos.docker
index 01d7b09..377721f 100644
--- a/m68k-amigaos.docker
+++ b/m68k-amigaos.docker
@@ -39,6 +39,7 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
 COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
 COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
 RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
+RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/AmigaOS.cmake
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
 ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
 ENV PATH ${PATH}:${CROSS_ROOT}/bin

From 00a97e22b3d02112fc556499b53821b6a39ead1f Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon.beijer@cybercom.com>
Date: Thu, 13 Feb 2020 17:59:03 +0100
Subject: [PATCH 09/13] Put all images on same level Update toolchains
 submodule

---
 common.docker           | 27 ++++++++++++++++++---------
 dependencies/toolchains |  2 +-
 m68k-amigaos.docker     |  3 ++-
 ppc-amigaos.docker      |  5 ++++-
 ppc-morphos.docker      |  5 ++++-
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/common.docker b/common.docker
index 0cf3d60..3f0ffc8 100644
--- a/common.docker
+++ b/common.docker
@@ -1,10 +1,8 @@
+# START COMMON
 MAINTAINER Marlon Beijer "marlon@amigadev.com"
-
-RUN apt-get update && apt-get install -y apt-utils cmake wget git make autoconf pkg-config lhasa 
+RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y
 RUN echo "root:root" | chpasswd
-
 RUN ln -s /opt/${CROSS_PFX} /tools
-
 ENV CROSS_ROOT /opt/${CROSS_PFX}
 
 WORKDIR /work
@@ -16,12 +14,23 @@ COPY imagefiles/entrypoint.sh /entry/
 
 ENV AS=${CROSS_ROOT}/bin/${CROSS_PFX}-as \
 	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++ \
+	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
-	
+
+RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ar /usr/bin/ar && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ld /usr/bin/ld && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-gcc /usr/bin/gcc && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-g++ /usr/bin/g++ && \
+	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib
+
 COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
+COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
+RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
+RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
 ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
-ENV PATH ${PATH}:${CROSS_ROOT}/bin
\ No newline at end of file
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+# END COMMON
diff --git a/dependencies/toolchains b/dependencies/toolchains
index 6b8d3ce..fb2f1ac 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit 6b8d3ced2b8a0cf1bf51256efb46617d45437207
+Subproject commit fb2f1acdfc6ae7f415765729c81a3162437b8651
diff --git a/m68k-amigaos.docker b/m68k-amigaos.docker
index 377721f..eac1597 100644
--- a/m68k-amigaos.docker
+++ b/m68k-amigaos.docker
@@ -3,6 +3,7 @@ FROM amigadev/m68k-amigaos-gcc:latest as build-env
 FROM amigadev/docker-base:latest
 
 ENV CROSS_PFX m68k-amigaos
+ENV OS_NAME AmigaOS
 
 # Temporary fix
 COPY --from=build-env /opt/amiga /opt/${CROSS_PFX}
@@ -39,7 +40,7 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
 COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
 COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
 RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
-RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/AmigaOS.cmake
+RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
 ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
 ENV PATH ${PATH}:${CROSS_ROOT}/bin
diff --git a/ppc-amigaos.docker b/ppc-amigaos.docker
index 6469704..964f520 100644
--- a/ppc-amigaos.docker
+++ b/ppc-amigaos.docker
@@ -3,12 +3,12 @@ FROM amigadev/adtools:latest as build-env
 FROM amigadev/docker-base:latest
 
 ENV CROSS_PFX ppc-amigaos
+ENV OS_NAME AmigaOS
 
 COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
 
 # START COMMON
 MAINTAINER Marlon Beijer "marlon@amigadev.com"
-
 RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y
 RUN echo "root:root" | chpasswd
 RUN ln -s /opt/${CROSS_PFX} /tools
@@ -36,6 +36,9 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
 	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib
 
 COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
+COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
+RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
+RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
 ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
 ENV PATH ${PATH}:${CROSS_ROOT}/bin
diff --git a/ppc-morphos.docker b/ppc-morphos.docker
index 9fee5ff..914cb12 100644
--- a/ppc-morphos.docker
+++ b/ppc-morphos.docker
@@ -3,12 +3,12 @@ FROM amigadev/morphos-cross-toolchain:latest as build-env
 FROM amigadev/docker-base:latest
 
 ENV CROSS_PFX ppc-morphos
+ENV OS_NAME MorphOS
 
 COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}
 
 # START COMMON
 MAINTAINER Marlon Beijer "marlon@amigadev.com"
-
 RUN apt purge -y gcc g++ flex bison gettext texinfo binutils libgmp-dev libmpfr-dev libmpc-dev libncurses-dev && apt autoremove -y
 RUN echo "root:root" | chpasswd
 RUN ln -s /opt/${CROSS_PFX} /tools
@@ -36,6 +36,9 @@ RUN ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-as /usr/bin/as && \
 	ln -sf ${CROSS_ROOT}/bin/${CROSS_PFX}-ranlib /usr/bin/ranlib
 
 COPY dependencies/toolchains/${CROSS_PFX}.cmake ${CROSS_ROOT}/lib/
+COPY dependencies/toolchains/Modules/${CROSS_PFX} /CMakeModules
+RUN mv -fv /CMakeModules/* /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/
+RUN ln -s /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/Generic.cmake /usr/share/cmake-`cmake --version|awk '{ print $3;exit }'|awk -F. '{print $1"."$2}'`/Modules/Platform/${OS_NAME}.cmake
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/lib/${CROSS_PFX}.cmake
 ENV CMAKE_PREFIX_PATH /opt/${CROSS_PFX}:/opt/${CROSS_PFX}/usr
 ENV PATH ${PATH}:${CROSS_ROOT}/bin

From 85bb5569f14d79128040bd974a3557d1122b2a51 Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon.beijer@cybercom.com>
Date: Thu, 13 Feb 2020 18:17:37 +0100
Subject: [PATCH 10/13] Update toolchains submodule

---
 dependencies/toolchains | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies/toolchains b/dependencies/toolchains
index fb2f1ac..87a5b09 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit fb2f1acdfc6ae7f415765729c81a3162437b8651
+Subproject commit 87a5b09b0396a84d360e2fe97a52fc7ee6caad39

From 172bdae5d9eeb050a92e67c194815435290c5d37 Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon.beijer@cybercom.com>
Date: Thu, 13 Feb 2020 18:31:36 +0100
Subject: [PATCH 11/13] Update toolchains submodule

---
 dependencies/toolchains | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies/toolchains b/dependencies/toolchains
index 87a5b09..a6c282d 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit 87a5b09b0396a84d360e2fe97a52fc7ee6caad39
+Subproject commit a6c282d5903cd93004a26706126a5e115fc7dd96

From a72bb945aae072972673d7ad753907f716f6801d Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon.beijer@cybercom.com>
Date: Thu, 13 Feb 2020 18:34:47 +0100
Subject: [PATCH 12/13] Update toolchains submodule

---
 dependencies/toolchains | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies/toolchains b/dependencies/toolchains
index a6c282d..b39c7d8 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit a6c282d5903cd93004a26706126a5e115fc7dd96
+Subproject commit b39c7d80ee59fb2ec65a85a238879b5162f9ff9d

From b112cb261578aea53e5bc97a5f610c8b38e56c60 Mon Sep 17 00:00:00 2001
From: Marlon Beijer <marlon@eevul.org>
Date: Sat, 15 Feb 2020 12:54:27 +0100
Subject: [PATCH 13/13] Update toolchains submodule

---
 dependencies/toolchains | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies/toolchains b/dependencies/toolchains
index b39c7d8..a1395e7 160000
--- a/dependencies/toolchains
+++ b/dependencies/toolchains
@@ -1 +1 @@
-Subproject commit b39c7d80ee59fb2ec65a85a238879b5162f9ff9d
+Subproject commit a1395e7201abb016728ef4ed5b474347be140e00