From b8d326ccff1f3c158e1cef053d2b7a5d5206b7cf Mon Sep 17 00:00:00 2001
From: Raymond Toy <toy.raymond@gmail.com>
Date: Tue, 19 Dec 2017 17:46:39 -0800
Subject: [PATCH] Update CI to do the required cross-compile

---
 .gitlab-ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c8e48221..f7b14ba53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,10 @@ linux-runner:
     - mkdir snapshot
     - (cd snapshot; tar xjf ../cmucl-21c-x86-linux.tar.bz2; tar xjf ../cmucl-21c-x86-linux.extra.tar.bz2)
   script:
-    - bin/build.sh -C "" -o ./snapshot/bin/lisp
+    - bin/create-target.sh xtarget x86_linux x86
+    - bin/create-target.sh xcross x86_linux x86
+    - bin/cross-build-world.sh -crl xtarget xcross src/bootfiles/21c/boot-21c-cross.lisp ./snapshot/bin/lisp
+    - bin/build.sh -C "" -o xtarget/lisp/lisp
     - bin/make-dist.sh -I dist linux-4
     - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log
 
@@ -20,6 +23,9 @@ osx-runner:
     - mkdir snapshot
     - (cd snapshot; tar xjf ../cmucl-21c-x86-darwin.tar.bz2)
   script:
-    - bin/build.sh -C "" -o ./snapshot/bin/lisp
+    - bin/create-target.sh xtarget x86_darwin
+    - bin/create-target.sh xcross x86_darwin
+    - bin/cross-build-world.sh -crl xtarget xcross src/bootfiles/21c/boot-21c-cross.lisp ./snapshot/bin/lisp
+    - bin/build.sh -C "" -o xtarget/lisp/lisp
     - bin/make-dist.sh -I dist darwin-4
     - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log
-- 
GitLab