From f6073b2551b4053087052fc5a31e3875e1f67913 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 15 Aug 2008 05:56:53 +0000
Subject: 	* lisp/core.lisp.in (getOptionValue): Export. 	*
 interp/sys-driver.boot (initializeGlobalState): Record value for 
 --system-algebra. 	* interp/sys-globals.boot ($buildingSystemAlgebra):
 Declare. 	* interp/compiler.boot (compileSpad2Cmd): Don't build local 
 database if compiling system algebra. 	* interp/i-syscmd.boot
 (compileAsharpCmd1): Likewise. 	* algebra/Makefile.pamphlet
 (%.NRLIB/code.$(FASLEXT)): Use 	--system-algebra. 
 (SPADPRSR.NRLIB/code.$(FASLEXT)): Likewise. 
 (PARSER.NRLIB/code.$(FASLEXT)): Likewise.

---
 src/interp/compiler.boot    | 3 ++-
 src/interp/i-syscmd.boot    | 3 ++-
 src/interp/sys-driver.boot  | 2 ++
 src/interp/sys-globals.boot | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 644a7f79..b3f6a7f7 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1741,7 +1741,8 @@ compileSpad2Cmd args ==
         compilerDoitWithScreenedLisplib(constructor, fun)
     else
         compilerDoit(constructor, fun)
-    extendLocalLibdb $newConlist
+    if not $buildingSystemAlgebra then 
+      extendLocalLibdb $newConlist
     terminateSystemCommand()
     spadPrompt()
 
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 9390db26..d45895b2 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -608,7 +608,8 @@ compileAsharpCmd1 args ==
     else if ^beQuiet then
         sayKeyedMsg("S2IZ0084", nil)
 
-    extendLocalLibdb $newConlist
+    if not $buildingSystemAlgebra then
+      extendLocalLibdb $newConlist
 
 compileAsharpArchiveCmd args ==
     -- Assume we entered from the "compiler" function, so args ^= nil
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index 593244f3..f620ea09 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -189,6 +189,8 @@ initializeGlobalState() ==
   RESTART0()
   $NEWSPAD := true
   $SPAD := true
+  $buildingSystemAlgebra := 
+    getOptionValue(Option '"system-algebra",%systemOptions())
 
 ++ execute Spad script
 executeSpadScript(progname,options,file) ==
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index bd47c14e..c66f0d82 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -468,3 +468,8 @@ $OutputStream :=
 
 $ErrorStream :=
   MAKE_-SYNONYM_-STREAM "*STANDARD-OUTPUT*"
+
+--%
+
+++ True if we are building the system algebra.
+$buildingSystemAlgebra := false
-- 
cgit v1.2.3