changeset 13: |
cb700df303f7 |
parent 12: |
406b7640f3e4 |
child 14: |
b1363d688ae1 |
author: |
ellis <ellis@rwest.io> |
date: |
Sun, 26 Nov 2023 22:09:09 -0500 |
files: |
etc/rust/config.toml makefile scripts/get-rust.sh scripts/get-sbcl.sh |
description: |
rust |
1.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2+++ b/etc/rust/config.toml Sun Nov 26 22:09:09 2023 -0500
1.3@@ -0,0 +1,6 @@
1.4+[build]
1.5+compiler-docs = true
1.6+target = ["x86_64-unknown-linux-gnu"]
1.7+
1.8+[rust]
1.9+lto = "thin"
1.10\ No newline at end of file
2.1--- a/makefile Fri Nov 24 18:10:11 2023 -0500
2.2+++ b/makefile Sun Nov 26 22:09:09 2023 -0500
2.3@@ -48,10 +48,21 @@
2.4 $< $(SBCL_VERSION)
2.5
2.6 ### Rust
2.7-RUST_TARGET:=rocksdb-$(ROCKSDB_VERSION)
2.8+RUST_TARGET:=rust-$(RUST_VERSION)
2.9 rust:scripts/get-rust.sh
2.10 $< $(RUST_VERSION)
2.11-
2.12+rust-install-x:rust;
2.13+ cargo install --path build/$(RUST_TARGET)/src/tools/x
2.14+rust-build:rust rust-install-x;
2.15+ cd build/$(RUST_TARGET) && x build library
2.16+rust-doc:rust rust-install-x;
2.17+ cd build/$(RUST_TARGET) && x doc
2.18+rust-build-full:rust-build;
2.19+ cd build/$(RUST_TARGET) && x build --stage 2 compiler/rustc
2.20+rust-install:rust-build;
2.21+ cd build/$(RUST_TARGET) && x install
2.22+rust-dist:rust-build;
2.23+ cd build/$(RUST_TARGET) && x dist
2.24 ### Code
2.25 code:scripts/get-code.sh
2.26 $< $(SRC)
3.1--- a/scripts/get-rust.sh Fri Nov 24 18:10:11 2023 -0500
3.2+++ b/scripts/get-rust.sh Sun Nov 26 22:09:09 2023 -0500
3.3@@ -1,3 +1,11 @@
3.4-#!/bin/sh
3.5-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
3.6-rustup default nightly
3.7+#!/usr/bin/bash
3.8+
3.9+#curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
3.10+#rustup update
3.11+#rustup default nightly
3.12+
3.13+VER="${1:-main}"
3.14+TARGETDIR=${2:-$(realpath build/rust-$VER)}
3.15+DISTDIR=${3:-$(realpath dist/rust)}
3.16+git clone https://vc.compiler.company/packy/shed/vendor/rust.git $TARGETDIR
3.17+pushd $TARGETDIR
4.1--- a/scripts/get-sbcl.sh Fri Nov 24 18:10:11 2023 -0500
4.2+++ b/scripts/get-sbcl.sh Sun Nov 26 22:09:09 2023 -0500
4.3@@ -4,8 +4,9 @@
4.4 DISTDIR=${3:-$(realpath dist/sbcl)}
4.5 git clone https://vc.compiler.company/packy/shed/vendor/sbcl.git $TARGETDIR
4.6 pushd $TARGETDIR
4.7-sh make.sh --prefix=$DISTDIR --fancy \
4.8- # && cd tests && sh run-tests.sh && cd .. \ ## TODO futex fails
4.9- && cd doc/manual && make && cd ../.. \
4.10- && sh install.sh
4.11+sh make.sh --prefix=$DISTDIR --fancy
4.12+# make docs
4.13+cd doc/manual && make && cd ../..
4.14+# doesn't actually install on local system - copies to DISTDIR
4.15+sh install.sh
4.16 popd