changeset 223: |
8b389e2e1a69 |
parent 222: |
0a61207f30d7 |
child 224: |
3d36aef02f8f |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Mon, 06 May 2024 23:14:42 +0000 |
files: |
default.sxp install.sh |
description: |
defaults |
1.1--- a/default.sxp Mon May 06 18:51:19 2024 -0400
1.2+++ b/default.sxp Mon May 06 23:14:42 2024 +0000
1.3@@ -1,6 +1,10 @@
1.4 ;; -*- mode:skel -*-
1.5 :sbcl-version "2.4.4" ;; SBCL is always required for bootstrap
1.6
1.7+:cc "clang"
1.8+
1.9+:lisp "sbcl"
1.10+
1.11 :stash ".stash" ;; local build stash
1.12
1.13 :dist nil ;; remote distribution directory, or nil to use the stash
1.14@@ -10,3 +14,11 @@
1.15
1.16 :log-level :debug ;; should usually be set to at least :DEBUG, set to
1.17 ;; :TRACE or T for verbose output
1.18+
1.19+:lisp-home "/usr/local/share/lisp"
1.20+
1.21+:quicklisp-home "/usr/local/share/lisp/quicklisp"
1.22+
1.23+:rust-home "/usr/local/share/rust"
1.24+
1.25+:cargo-home "/usr/local/share/rust/cargo"
2.1--- a/install.sh Mon May 06 18:51:19 2024 -0400
2.2+++ b/install.sh Mon May 06 23:14:42 2024 +0000
2.3@@ -14,29 +14,20 @@
2.4 ;;
2.5 esac
2.6
2.7- local _url="https://packy.compiler.company/dist/${_arch}/cc-install${_ext}"
2.8+ local _url="https://packy.compiler.company/dist/${_arch}"
2.9 local _stash
2.10 if ! _stash=".stash"; then
2.11 # Because the previous command ran in a subshell, we must manually
2.12 # propagate exit status.
2.13 exit 1
2.14 fi
2.15- local _file="${_stash}/cc-install${_ext}"
2.16 ensure mkdir -p "$_stash"
2.17- printf '%s\n' 'info: starting cc-install...' 1>&2
2.18- ensure downloader "$_url" "$_file" "$_arch"
2.19- ensure chmod u+x "$_file"
2.20- if [ ! -x "$_file" ]; then
2.21- printf '%s\n' "Cannot execute $_file (likely because of mounting /tmp as noexec)." 1>&2
2.22- printf '%s\n' "Please copy the file to a location where you can execute binaries and run ./cc-install${_ext}." 1>&2
2.23- exit 1
2.24- fi
2.25- "$_file" "$@"
2.26- local _retval=$?
2.27- rm "$_file"
2.28- local _core_url="https://packy.compiler.company/dist/${_arch}/lisp/infra.core"
2.29- ensure downloader "$_core_url" "${_stash}/infra.core" "$_arch"
2.30- return "$_retval"
2.31+ local _cc_url="${_url}/cc-install"
2.32+ local _sbcl_url="${_url}/pack/sbcl.tar.zst"
2.33+ local _rocksdb_url="${_url}/pack/rocksdb.tar.zst"
2.34+ ensure downloader "$_sbcl_url" "${_stash}/sbcl.tar.zst" "$_arch"
2.35+ ensure downloader "$_rocksdb_url" "${_stash}/rocksdb.tar.zst" "$_arch"
2.36+ ensure downloader "$_cc_url" "${_stash}/cc-install" "$_arch"
2.37 }
2.38
2.39 say() {