[cmucl-cvs] CMUCL commit: src/lisp (lisp.c)

[Raymond Toy]

    Date: Friday, June 10, 2011 @ 12:32:32
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/lisp

Modified: lisp.c

Allow specifying a core with an executable image.

There's no reason why this shouldn't work and tests show that it does
work.  So instead of disallowing it, just print a warning that it is
unusual.  Fred also said this should work; it's just a bit odd running
a 30MB executable with a 30MB core.


--------+
 lisp.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Index: src/lisp/lisp.c
diff -u src/lisp/lisp.c:1.82 src/lisp/lisp.c:1.83
--- src/lisp/lisp.c:1.82	Tue May 31 06:26:41 2011
+++ src/lisp/lisp.c	Fri Jun 10 12:32:31 2011
@@ -1,7 +1,7 @@
 /*
  * main() entry point for a stand alone lisp image.
  *
- * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.82 2011/05/31 13:26:41 rtoy Exp $
+ * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.83 2011/06/10 19:32:31 rtoy Exp $
  *
  */
 
@@ -480,8 +480,8 @@
 	if (strcmp(arg, "-core") == 0) {
 	    if (builtin_image_flag) {
 		fprintf(stderr,
-			"Cannot specify core file in executable image --- sorry about that.\n");
-		exit(1);
+			"Warning:  specifying a core file with an executable image is unusual,\nbut should work.\n");
+                builtin_image_flag = 0;
 	    }
 
 	    if (core != NULL) {