~ chicken-core (chicken-5) 6ddfab3d00bc4ef38c59d97c5808010a29fed7e2
commit 6ddfab3d00bc4ef38c59d97c5808010a29fed7e2
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Mon Jan 11 08:02:30 2010 +0100
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Mon Jan 11 08:02:30 2010 +0100
simplification in Makefile.mingw-msys
diff --git a/Makefile.mingw-msys b/Makefile.mingw-msys
index ee7552e3..1f78f811 100644
--- a/Makefile.mingw-msys
+++ b/Makefile.mingw-msys
@@ -80,18 +80,7 @@ POSIXFILE = posixwin
include $(SRCDIR)/defaults.make
-# main target
-
-all: libchicken$(A) libuchicken$(A) \
- $(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)csi$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)chicken-profile$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)csc$(PROGRAM_SUFFIX)$(EXE) libchicken$(SO) \
- libuchicken$(SO) libchickengui$(SO) libchickengui$(A) \
- $(PROGRAM_PREFIX)chicken-install$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)chicken-uninstall$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)chicken-status$(PROGRAM_SUFFIX)$(EXE) \
- $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX)$(EXE)
+TARGETS += libchickengui$(SO) libchickengui$(A)
chicken-config.h: chicken-defaults.h
echo "#define HAVE_DIRENT_H 1" >$@
diff --git a/patches/finalizer-exceptions.diff b/patches/finalizer-exceptions.diff
index ef07c8b7..2167aa20 100644
--- a/patches/finalizer-exceptions.diff
+++ b/patches/finalizer-exceptions.diff
@@ -1,26 +1,26 @@
-Index: library.scm
-===================================================================
-@@ -4250,6 +4257,7 @@
- (define ##sys#run-pending-finalizers
- (let ([vector-fill! vector-fill!]
- [print print]
-+ [with-exception-handler with-exception-handler]
- [working #f] )
- (lambda (state)
- (unless working
-@@ -4262,8 +4270,13 @@
- (do ([i 0 (fx+ i 1)])
- ((fx>= i c))
- (let ([i2 (fx+ 1 (fx* i 2))])
-- ((##sys#slot ##sys#pending-finalizers (fx+ i2 1))
-- (##sys#slot ##sys#pending-finalizers i2)) ) )
-+ (##sys#call-with-current-continuation
-+ (lambda (ret)
-+ (with-exception-handler
-+ ret
-+ (lambda ()
-+ ((##sys#slot ##sys#pending-finalizers (fx+ i2 1))
-+ (##sys#slot ##sys#pending-finalizers i2)))))) ) )
- (vector-fill! ##sys#pending-finalizers (##core#undefined))
- (##sys#setislot ##sys#pending-finalizers 0 0)
- (set! working #f) ) )
+Index: library.scm
+===================================================================
+@@ -4250,6 +4257,7 @@
+ (define ##sys#run-pending-finalizers
+ (let ([vector-fill! vector-fill!]
+ [print print]
++ [with-exception-handler with-exception-handler]
+ [working #f] )
+ (lambda (state)
+ (unless working
+@@ -4262,8 +4270,13 @@
+ (do ([i 0 (fx+ i 1)])
+ ((fx>= i c))
+ (let ([i2 (fx+ 1 (fx* i 2))])
+- ((##sys#slot ##sys#pending-finalizers (fx+ i2 1))
+- (##sys#slot ##sys#pending-finalizers i2)) ) )
++ (##sys#call-with-current-continuation
++ (lambda (ret)
++ (with-exception-handler
++ ret
++ (lambda ()
++ ((##sys#slot ##sys#pending-finalizers (fx+ i2 1))
++ (##sys#slot ##sys#pending-finalizers i2)))))) ) )
+ (vector-fill! ##sys#pending-finalizers (##core#undefined))
+ (##sys#setislot ##sys#pending-finalizers 0 0)
+ (set! working #f) ) )
Trap