[Git][cmucl/cmucl][issue-101-clang-trapping-math] Fix merge conflicts

[Raymond Toy]

Raymond Toy pushed to branch issue-101-clang-trapping-math at cmucl / cmucl


Commits:
5bd06ed3 by Raymond Toy at 2021-02-04T16:55:11-08:00
Fix merge conflicts

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -41,7 +41,7 @@ linux:build:
     #- bin/create-target.sh xcross x86_linux_clang
     #- bin/cross-build-world.sh -crl -B boot-2020-04-1 xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp
     # Regular build using the cross-compiled result or snapshot
-    - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o xtarget/lisp/lisp
+    - bin/build.sh $bootstrap -R -C "x86_linux_clang" -o snapshot/bin/lisp
     - bin/make-dist.sh -I dist linux-4
 
 linux:test:



View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/5bd06ed3c9f9c20da4d071aad6404676d1931b46

-- 
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/5bd06ed3c9f9c20da4d071aad6404676d1931b46
You're receiving this email because of your account on gitlab.common-lisp.net.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mailman.common-lisp.net/pipermail/cmucl-cvs/attachments/20210205/0365ef14/attachment.html>