aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2012-10-11 01:15:49 +0000
committerdos-reis <gdr@axiomatics.org>2012-10-11 01:15:49 +0000
commitc3a353c9dfe6cd2f30f3bf52caa4a7fc0f86cc74 (patch)
tree629774b5de0e0cde1162a21e585aad4eb68d3a39
parent5c915a0a3337a1ef5b2902fc8e66d45f18899eed (diff)
downloadopen-axiom-c3a353c9dfe6cd2f30f3bf52caa4a7fc0f86cc74.tar.gz
2012-10-10 Igor Pashev <pashev.igor@gmail.com>
Andrey G, Grozin <A.G.Grozin@inp.nsk.su> Gabriel Dos Reis <gdr@cs.tamu.edu> * config/open-axiom.m4 (OPENAXIOM_LISP_FLAGS): Inhibit system-wide or user-supplied initialization files. src/ChangeLog 2012-10-10 Igor Pashev <pashev.igor@gmail.com> Andrey G, Grozin <A.G.Grozin@inp.nsk.su> Gabriel Dos Reis <gdr@cs.tamu.edu> * utils/command.cc (build_rts_options) [sbcl_runtime]: Inhibit system-wide and user-supplied initialization files.
-rw-r--r--ChangeLog7
-rw-r--r--config/open-axiom.m42
-rw-r--r--src/ChangeLog7
-rw-r--r--src/utils/command.cc6
4 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ef2fb0e..474e2edd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-10 Igor Pashev <pashev.igor@gmail.com>
+ Andrey G, Grozin <A.G.Grozin@inp.nsk.su>
+ Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * config/open-axiom.m4 (OPENAXIOM_LISP_FLAGS): Inhibit system-wide
+ or user-supplied initialization files.
+
2012-08-19 Gabriel Dos Reis <gdr@cs.tamu.edu>
* configure.ac: Define Automake conditional OA_DELAYED_FFI.
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 1860f8b1..69645b17 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -332,7 +332,7 @@ case $axiom_lisp_flavor in
;;
sbcl)
axiom_quiet_flags='--noinform --noprint'
- axiom_eval_flags='--eval'
+ axiom_eval_flags='--no-sysinit --no-userinit --eval'
;;
clisp)
axiom_quiet_flags='--quiet'
diff --git a/src/ChangeLog b/src/ChangeLog
index a8720025..8f0f6282 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-10 Igor Pashev <pashev.igor@gmail.com>
+ Andrey G, Grozin <A.G.Grozin@inp.nsk.su>
+ Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * utils/command.cc (build_rts_options) [sbcl_runtime]: Inhibit
+ system-wide and user-supplied initialization files.
+
2012-08-26 Gabriel Dos Reis <gdr@cs.tamu.edu>
* hyper/hthits.c (splitpage): Revert unintended change from last
diff --git a/src/utils/command.cc b/src/utils/command.cc
index 6821a3e0..58218c70 100644
--- a/src/utils/command.cc
+++ b/src/utils/command.cc
@@ -214,11 +214,13 @@ build_rts_options(Command* command, Driver driver)
break;
case sbcl_runtime:
- command->rt_args.allocate(4);
+ command->rt_args.allocate(6);
command->rt_args[0] = (char*) "--noinform";
command->rt_args[1] = (char*) "--end-runtime-options";
command->rt_args[2] = (char*) "--noprint";
- command->rt_args[3] = (char*) "--end-toplevel-options";
+ command->rt_args[3] = (char*) "--no-sysinit";
+ command->rt_args[4] = (char*) "--no-userinit";
+ command->rt_args[5] = (char*) "--end-toplevel-options";
break;
case clozure_runtime: