Using absolute import paths for kawa, since relative paths break on chained dependencies.

This commit is contained in:
Alex Shinn 2015-04-23 18:36:44 +09:00
parent 9b328359b5
commit db16fc693c

View file

@ -1167,12 +1167,14 @@
`(guile -L ,install-dir -L ,lib-path ,file) `(guile -L ,install-dir -L ,lib-path ,file)
`(guile -L ,install-dir ,file))) `(guile -L ,install-dir ,file)))
((kawa) ((kawa)
(let ((install-dir (path-resolve install-dir (current-directory))))
(if lib-path (if lib-path
`(kawa `(kawa
,(string-append "-Dkawa.import.path=" install-dir ":" lib-path) ,(string-append "-Dkawa.import.path=" install-dir ":"
(path-resolve lib-path (current-directory)))
--r7rs --script ,file) --r7rs --script ,file)
`(kawa ,(string-append "-Dkawa.import.path=" install-dir) `(kawa ,(string-append "-Dkawa.import.path=" install-dir)
--r7rs --script ,file))) --r7rs --script ,file))))
((larceny) ((larceny)
(if lib-path (if lib-path
`(larceny -r7rs -path ,(string-append install-dir ":" lib-path) `(larceny -r7rs -path ,(string-append install-dir ":" lib-path)