From f8485496e69d5d29d35b9b7b189df33fa71462ea Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Fri, 3 Feb 2012 18:23:03 -0700
Subject: [PATCH] svm: Fix (load-option 'compiler).

Syntax compiler/machine/make, not compiler/make.  The
compiler/make.bin|com symlinks seem to confuse sf/conditionally.
CREF is required when loading compiler-unx.pkd(?).
---
 src/compiler/machines/svm/compiler.sf | 8 +++-----
 src/compiler/machines/svm/make.scm    | 4 ++++
 src/etc/compile-svm.sh                | 9 ++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/compiler/machines/svm/compiler.sf b/src/compiler/machines/svm/compiler.sf
index 8958ffe98..62660f723 100644
--- a/src/compiler/machines/svm/compiler.sf
+++ b/src/compiler/machines/svm/compiler.sf
@@ -26,10 +26,8 @@ USA.
 
 ;;;; Script to incrementally syntax the compiler
 
-(with-loader-base-uri "../lib"		;Use the accompanying sf and cref.
-  (lambda ()
-    (load-option 'CREF)
-    (load-option 'SF)))
+(load-option 'CREF)
+(load-option 'SF)
 
 ;; Guarantee that the compiler's package structure exists.
 (if (not (name->package '(COMPILER)))
@@ -85,7 +83,7 @@ USA.
 
 ;; Resyntax any files that need it.
 ((access syntax-files! (->environment '(COMPILER))))
-(sf-conditionally "make")
+(sf-conditionally "machine/make")
 
 ;; Rebuild the package constructors and cref.
 (cref/generate-constructors "compiler" 'ALL)
\ No newline at end of file
diff --git a/src/compiler/machines/svm/make.scm b/src/compiler/machines/svm/make.scm
index fb55b5127..bf5fadced 100644
--- a/src/compiler/machines/svm/make.scm
+++ b/src/compiler/machines/svm/make.scm
@@ -28,6 +28,10 @@ USA.
 
 (declare (usual-integrations))
 
+;; The (cross-reference) package is needed when loading the compiler's
+;; package set.
+(load-option 'CREF)
+
 (let ((value ((load "base/make") "svm1")))
   (set! (access compiler:compress-top-level? (->environment '(compiler))) #t)
   ((access init-assembler-instructions! (->environment '(compiler assembler))))
diff --git a/src/etc/compile-svm.sh b/src/etc/compile-svm.sh
index 22f2a5c5f..0918d3e8a 100755
--- a/src/etc/compile-svm.sh
+++ b/src/etc/compile-svm.sh
@@ -53,7 +53,7 @@ done
 run_cmd_in_dir star-parser "${@}" --batch-mode --load compile.scm </dev/null
 FASL=make.com
 
-# Dump prerequisites into x-runtime.com.
+# Dump new runtime into x-runtime.com.
 run_cmd_in_dir runtime \
     "${@}" --batch-mode --library ../lib --fasl $FASL <<EOF
 (disk-save "../lib/x-runtime.com")
@@ -80,17 +80,12 @@ run_cmd "${@}" --batch-mode --library lib --band x-runtime.com <<EOF
 (load-option 'SF)
 (load-option 'CREF)
 (load-option '*PARSER)
-;;(load-option 'COMPILER)
-;; The above fails!  Unable to find package directory: "compiler"
-(with-working-directory-pathname "compiler"
-  (lambda () (load "machine/make")))
+(load-option 'COMPILER)
 (disk-save "lib/x-compiler.com")
 EOF
 
 # Remove host code to STAGEX/ subdirs.
 run_cmd ./Stage.sh make X
-# Dodge incompatibility between 9.0.1 and master.
-run_cmd_in_dir runtime mv os2winp.ext os2winp.bin STAGEX
 
 # Restore previously cross-compiled code (if any).  (Replace "unmake"
 # with "remove" to start from scratch with each rebuilt
-- 
2.25.1