~ chicken-core (chicken-5) d5cdeda602da63c03ba50d0d2ae5eabab733865f

commit d5cdeda602da63c03ba50d0d2ae5eabab733865f
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sun Jun 6 12:55:59 2010 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun Jun 6 12:55:59 2010 +0200

    removed unused global; fixed incorrect option for -O3

diff --git a/batch-driver.scm b/batch-driver.scm
index d603eaca..5e620819 100644
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@ -195,8 +195,7 @@
       (set! local-definitions #t))
     (when (memq 'inline-global options)
       (set! enable-inline-files #t)
-      (set! inline-locally #t)
-      (set! inline-globally #t))
+      (set! inline-locally #t))
     (when (or verbose do-scrutinize)
       (set! ##sys#notices-enabled #t))
     (when (memq 'no-warnings options) 
@@ -522,7 +521,6 @@
 		    (concatenate (map cdr req))) )
 		 (let ((ifs (collect-options 'consult-inline-file)))
 		   (unless (null? ifs)
-		     (set! inline-globally #t)
 		     (set! inline-locally #t)
 		     (for-each 
 		      (lambda (ilf)
diff --git a/chicken.scm b/chicken.scm
index 6ac0c7c7..7596da68 100644
--- a/chicken.scm
+++ b/chicken.scm
@@ -88,7 +88,7 @@
 		      (cons* 'optimize-leaf-routines 'inline options)) ) 
 		   ((3)
 		    (set! options
-		      (cons* 'optimize-leaf-routines 'inline 'inline-globally  options) ) )
+		      (cons* 'optimize-leaf-routines 'inline 'inline-global  options) ) )
 		   ((4)
 		    (set! options
 		      (cons* 'optimize-leaf-routines 'inline 'local 'unboxing 'unsafe
diff --git a/compiler-namespace.scm b/compiler-namespace.scm
index bd07f5d6..7fde0db8 100644
--- a/compiler-namespace.scm
+++ b/compiler-namespace.scm
@@ -173,7 +173,6 @@
  read-info-hook
  initialize-analysis-database
  initialize-compiler
- inline-globally
  inline-lambda-bindings
  inline-locally
  inline-max-size
diff --git a/compiler.scm b/compiler.scm
index c90eb40b..29a12b8e 100644
--- a/compiler.scm
+++ b/compiler.scm
@@ -330,7 +330,6 @@
 (define all-import-libraries #f)
 (define standalone-executable #t)
 (define local-definitions #f)
-(define inline-globally #f)
 (define inline-locally #f)
 (define inline-output-file #f)
 (define do-scrutinize #f)
@@ -1353,11 +1352,10 @@
 		    (set! extended-bindings (lset-difference eq? default-extended-bindings syms)) ) ] ) ]
 	  ((inline-global)
 	   (set! enable-inline-files #t)
-	   (if (null? (cddr spec))
-	       (set! inline-globally #f)
-	       (for-each
-		(cut mark-variable <> '##compiler#inline-global 'no)
-		(stripa (cddr spec)))))
+	   (when (pair? (cddr spec))
+	     (for-each
+	      (cut mark-variable <> '##compiler#inline-global 'no)
+	      (stripa (cddr spec)))))
 	  [else
 	   (check-decl spec 1 1)
 	   (let ((id (strip (cadr spec))))
@@ -1431,11 +1429,10 @@
        ((inline-global)
 	(set! enable-inline-files #t)
 	(set! inline-locally #t)
-	(if (null? (cdr spec))
-	    (set! inline-globally #t)
-	    (for-each
-	     (cut mark-variable <> '##compiler#inline-global 'yes)
-	     (stripa (cdr spec)))))
+	(when (pair? (cdr spec))
+	  (for-each
+	   (cut mark-variable <> '##compiler#inline-global 'yes)
+	   (stripa (cdr spec)))))
        ((type)
 	(for-each
 	 (lambda (spec)
diff --git a/rules.make b/rules.make
index bb2dbd57..2ae5e228 100644
--- a/rules.make
+++ b/rules.make
@@ -1103,4 +1103,5 @@ buildhead:
 
 boot-chicken:
 	$(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
-	  PROGRAM_SUFFIX=-boot STATICBUILD=1 confclean chicken-boot$(EXE)
+	  SRCDIR=$(SRCDIR) CHICKEN=$(CHICKEN) PROGRAM_SUFFIX=-boot STATICBUILD=1 \
+	  confclean chicken-boot$(EXE)