diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/driver/Makefile.in | 2 | ||||
| -rw-r--r-- | src/driver/utils.c | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 457c36a9..c3880ef6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-06-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * driver/utils.c (openaxiom_execute_core): Don't let CLISP fool + itself. + 2010-06-04 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/exposed.lsp.pamphlet: Expose SquareMatrix. diff --git a/src/driver/Makefile.in b/src/driver/Makefile.in index 3862dfba..75e67763 100644 --- a/src/driver/Makefile.in +++ b/src/driver/Makefile.in @@ -64,7 +64,7 @@ open-axiom$(EXEEXT): $(open_axiom_objects) $(LINK) -o $@ $(open_axiom_objects) $(open_axiom_LDADD) mostlyclean-local: - @rm -f $(axiom_objects) + @rm -f $(open_axiom_objects) @rm -f *~ core clean-local: mostlyclean-local diff --git a/src/driver/utils.c b/src/driver/utils.c index d0d4ca86..ea8c4faf 100644 --- a/src/driver/utils.c +++ b/src/driver/utils.c @@ -392,6 +392,10 @@ openaxiom_execute_core(const openaxiom_command* command, something to tell about what GCL's own runtime is. Silly. */ if (OPENAXIOM_BASE_RTS == openaxiom_gcl_runtime) args[0] = ""; + /* And CLISP wants to believe that argv[0] is where it hides stuff + from the saved image. */ + else if (OPENAXIOM_BASE_RTS == openaxiom_clisp_runtime) + args[0] = execpath; else args[0] = command->core.argv[0]; /* Now, make sure we copy whatever arguments are required by the |