diff --git a/README.md b/README.md index ad1c71c..5adca2c 100644 --- a/README.md +++ b/README.md @@ -46,14 +46,19 @@ Requrirements: * bonnibel * ninja * clang +* nasm * mtools * curl for downloading the toolchain ### Setting up the cross toolchain -If you have `clang` and `curl` installed, runing the `scripts/build_sysroot_clang.sh` -script will download and build a nasm/binutils/LLVM toolchain configured for building -jsix host binaries. +Running `pb sync` will download and unpack the toolchain into `sysroot`. + +#### Compiling the toolchain yourself + +If you have `clang` and `curl` installed, runing the `scripts/build_sysroot.sh` +script will download and build a LLVM toolchain configured for building jsix +host binaries. ### Building and running jsix diff --git a/modules.yaml b/modules.yaml index 26d3f05..df3d73f 100644 --- a/modules.yaml +++ b/modules.yaml @@ -1,13 +1,10 @@ name: jsix templates: scripts/templates -vars: - foo: bar - bat: baz modules: kernel: + kind: exe output: jsix.elf target: host - kind: exe deps: - elf - initrd @@ -132,3 +129,8 @@ modules: - src/tests/logger.cpp - src/tests/heap_allocator.cpp - src/tests/main.cpp +overlays: + - url: https://f000.backblazeb2.com/file/jsix-os/sysroot-llvm8-20190706.tar.bz2 + path: sysroot + - url: https://f000.backblazeb2.com/file/jsix-os/sysroot-j6libc-8cb8ce7.tar.bz2 + path: sysroot diff --git a/peru.yaml b/peru.yaml deleted file mode 100644 index 727c514..0000000 --- a/peru.yaml +++ /dev/null @@ -1,13 +0,0 @@ -imports: - sysroot: ./sysroot - j6libc: ./sysroot - -curl module sysroot: - url: https://f000.backblazeb2.com/file/jsix-os/sysroot-llvm8-20190706.tar.bz2 - unpack: tar - export: sysroot/ - -curl module j6libc: - url: https://f000.backblazeb2.com/file/jsix-os/sysroot-j6libc-8cb8ce7.tar.bz2 - unpack: tar - export: sysroot/