1.1--- a/bootstrap.lisp Tue Apr 30 22:35:33 2024 -0400
1.2+++ b/bootstrap.lisp Wed May 01 20:16:42 2024 -0400
1.3@@ -9,23 +9,33 @@
1.4 (:use :cl :skel :log :std/named-readtables
1.5 :dat/json :dat/sxp :net/fetch :net/util
1.6 :cli/progress :cli/ansi :cli/ed :cli/prompt
1.7- :cli/shell :std/hash-table :std/alien))
1.8+ :cli/shell :std/hash-table :std/alien :std/macs
1.9+ :std/fmt))
1.10 (in-package :infra/bootstrap)
1.11 (in-readtable :shell)
1.12
1.13 (eval-when (:compile-toplevel)
1.14- (defstruct host name cpus mem os kernel core)
1.15- (defparameter *config-file* (or (pathname (sb-posix:getenv "BUILD_PROFILE")) #P"default.sxp"))
1.16- (defparameter *build-config* (read-sxp-file *config-file*))
1.17- (defparameter *host-config* (make-host :name (sb-unix:unix-gethostname) :cpus (num-cpus) :mem #+nil (mem-total) 15815828
1.18- :os "archlinux" :kernel "linux" :core sb-ext:*core-pathname*))
1.19+ (defstruct host name cpus mem arch kernel core)
1.20+ (defparameter *profile* (read-sxp-file
1.21+ (if-let ((profile (sb-posix:getenv "BUILD_PROFILE")))
1.22+ profile
1.23+ #P"default.sxp")))
1.24+ (defparameter *core* sb-ext:*core-pathname*)
1.25+ (defparameter *host-config* (read-sxp-file
1.26+ (let ((hcfg (format nil "~a.sxp" (sb-unix:unix-gethostname))))
1.27+ (unless (probe-file hcfg)
1.28+ (print #0$./check.sh$#))
1.29+ hcfg)))
1.30 (defparameter *env* (let ((table (make-hash-table :test 'equal))
1.31- (keys (list "CC" "AR" "STASH" "STORE" "DIST" "PACKY_URL" "VC_URL" "PREFIX")))
1.32+ (keys (list "STASH" "STORE" "DIST" "PACKY_URL" "VC_URL" "INSTALL_PREFIX"
1.33+ "CC" "AR" "HG" "GIT" "LISP" "RUST" "LD" "SHELL" "DEV" "DEV_HOME"
1.34+ "DEV_ID" "WORKER" "WORKER_ID" "WORKER_HOME" "CARGO_HOME" "RUSTUP_HOME"
1.35+ "LISP_HOME")))
1.36 (dolist (k keys table)
1.37 (setf (gethash k table) (sb-posix:getenv k))))))
1.38
1.39 (info! "starting bootstrap.lisp")
1.40-(debug! "host:" sb-sys::*machine-version*)
1.41+(println sb-sys::*machine-version*)
1.42 (trace! "env:" (hash-table-alist *env*))
1.43
1.44 ;; build-config