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] 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