janneke pushed a commit to branch wip-mingw
in repository guile.
commit d6ce5acbd96d8b7d38b5354071d35f419e7c461a
Author: Jan (janneke) Nieuwenhuizen <[email protected]>
AuthorDate: Wed May 11 16:27:14 2022 +0200
squash! Fix 'absolute-file-name?' and others for cross-build to MinGW.
FIXME in 3.0.7, this works:
;; boot-9.scm
(define (compile-time-file-name-convention)
(let ((target ((@ (system base target) target-type))))
(cond ((equal? target %host-type)
(system-file-name-convention))
((string-contains-ci target "mingw")
'windows)
(else
'posix)))))
in 3.0.8 it aborts hard.
guile: uncaught exception:
Unbound variable:define-module
Cannot exit gracefully when init is in progress; aborting.
* module/ice-9/boot-9.scm (eval): Avoid calling (target-type) this
hardcodes 'posix again.
---
module/ice-9/boot-9.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index f9b92d6ed..198a887c1 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -2062,7 +2062,7 @@ non-locally, that exit determines the continuation."
(eval-when (eval)
(define (compile-time-file-name-convention)
- (let ((target ((@ (system base target) target-type))))
+ (let ((target (or "FIXME" ((@ (system base target) target-type)))))
(cond ((equal? target %host-type)
(system-file-name-convention))
((string-contains-ci target "mingw")