oasis

commit: 84974786b137f3aed22a29132254b4ac81fa220a
parent 47d51862dbc21d5ffd30a3f370d4c7fd7d0f273c
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 20 Mar 2020 14:50:52 -0700

Use musl.cc toolchain for continuous build

Diffstat:
M
.build.yml
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/.build.yml b/.build.yml
@@ -13,7 +13,7 @@ sources:
 secrets:
 - 0d338ffe-699f-4e82-85a0-3a4407172bed
 environment:
-  PATH: /home/build/toolchain/bin:/home/build/oasis/out/pkg/texi2mdoc:/usr/sbin:/usr/bin:/sbin:/bin
+  PATH: /home/build/x86_64-linux-musl-cross/bin:/home/build/oasis/out/pkg/texi2mdoc:/usr/sbin:/usr/bin:/sbin:/bin
   PAXREAD: bsdtar -x -f -
   GIT_SSH_COMMAND: ssh -o StrictHostKeyChecking=no
   SETS: core desktop devel extra media net
@@ -22,7 +22,8 @@ tasks:
     git config --global user.name oasis
     git config --global user.email oasis
     git clone --mirror --no-single-branch --depth 1 https://github.com/oasislinux/root-x86_64
-    git clone --depth 1 https://github.com/oasislinux/toolchain
+    curl -LO http://musl.cc/x86_64-linux-musl-cross.tgz
+    tar xzf x86_64-linux-musl-cross.tgz
 - build: |
     cd oasis
     cat >config.lua <<EOF
@@ -31,7 +32,7 @@ tasks:
     return {
     	builddir='out',
     	fs={{sets[set], exclude={'^include/', '^lib/.*%.a$'}}},
-    	target={platform='x86_64-linux-musl', cflags='-O2 -pipe -fpie', ldflags='-s -static -pie', pie=true},
+    	target={platform='x86_64-linux-musl', cflags='-O2 -pipe', ldflags='-s -static'},
     	host={cflags='-pipe', ldflags=''},
     	repo={path='$HOME/root-x86_64.git', flags='--bare', tag='tree', branch=set},
     }