comparison patches/guile-1.9.15-mingw-compile.patch @ 6489:840b403f7762

mingw::guile: another round of 1.9 patches.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 07 Feb 2011 12:51:53 +0100
parents 919f33e40679
children
comparison
equal deleted inserted replaced
6488:5241c71e066c 6489:840b403f7762
1 --- guile-1.9.15/module/system/base/compile.scm~ 2011-01-26 23:03:16.000000000 +0100 1 --- guile-1.9.15/module/system/base/compile.scm~ 2011-01-26 23:03:16.000000000 +0100
2 +++ guile-1.9.15/module/system/base/compile.scm 2011-02-03 23:29:08.090142894 +0100 2 +++ guile-1.9.15/module/system/base/compile.scm 2011-02-04 12:04:15.765055771 +0100
3 @@ -104,6 +104,7 @@ 3 @@ -100,11 +100,16 @@
4 ".go")
5 (else (car %load-compiled-extensions))))
6 (and %compile-fallback-path
7 - (let ((f (string-append
8 + (let* ((c (canonicalize-path file))
9 + (f (string-append
4 %compile-fallback-path 10 %compile-fallback-path
5 ;; no need for '/' separator here, canonicalize-path 11 ;; no need for '/' separator here, canonicalize-path
6 ;; will give us an absolute path 12 ;; will give us an absolute path
7 + "/" ;; which does not start with / on MINGW 13 - (canonicalize-path file)
8 (canonicalize-path file) 14 + (if (eq? (string-ref c 1) #\:)
15 + ;; on Mingw remove drive-letter separator `:' to
16 + ;; obtain valid file name
17 + (substring c 2)
18 + c)
9 (compiled-extension)))) 19 (compiled-extension))))
10 (and (false-if-exception (ensure-writable-dir (dirname f))) 20 (and (false-if-exception (ensure-writable-dir (dirname f)))
21 f))))