~ chicken-core (chicken-5) 03113e3ce7be377e07c55779088bcf8ea08a3c02


commit 03113e3ce7be377e07c55779088bcf8ea08a3c02
Author:     Peter Bex <Peter.Bex@xs4all.nl>
AuthorDate: Sat Sep 11 14:52:40 2010 +0200
Commit:     Peter Bex <Peter.Bex@xs4all.nl>
CommitDate: Sat Sep 11 14:52:40 2010 +0200

    Get rid of accidental re-use of a variable name 'declare-compiler-object'. The name is both wrong for the second instance and a duplicate of a variable used earlier in the file, which could result in trouble if the declaration block is moved around in the file.

diff --git a/rules.make b/rules.make
index 5c6be9d2..cb5408f5 100644
--- a/rules.make
+++ b/rules.make
@@ -513,14 +513,14 @@ $(foreach obj, $(IMPORT_LIBRARIES),\
 
 # Bootstrap compiler objects
 
-define declare-compiler-object
+define declare-bootstrap-compiler-object
 $(1).c: $$(SRCDIR)$(1).scm $$(SRCDIR)compiler-namespace.scm \
 	  $$(SRCDIR)private-namespace.scm $$(SRCDIR)tweaks.scm
 	$$(CHICKEN) $$< $$(CHICKEN_COMPILER_OPTIONS) -output-file $$@ 
 endef
 
 $(foreach obj, $(COMPILER_OBJECTS_1),\
-          $(eval $(call declare-compiler-object,$(obj))))
+          $(eval $(call declare-bootstrap-compiler-object,$(obj))))
 
 
 csi.c: $(SRCDIR)csi.scm $(SRCDIR)banner.scm $(SRCDIR)private-namespace.scm
Trap