From 52d764209b36cba9a098767714d0c356e7ba3414 Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Wed, 14 Jun 2017 21:37:10 -0400 Subject: [PATCH] Issue #196 - Check system folder for libraries Check sys folder if a library cannot be found, before giving up and checking local dir. --- scheme/cyclone/libraries.sld | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scheme/cyclone/libraries.sld b/scheme/cyclone/libraries.sld index d6e53a4c..60ec7319 100644 --- a/scheme/cyclone/libraries.sld +++ b/scheme/cyclone/libraries.sld @@ -284,9 +284,10 @@ (return f)))) (append prepend-dirs (list dir) append-dirs)) ;; Not found, just return base name - (if (> (string-length dir) 0) - (string-append dir "/" filename) - filename))) + (lib:check-system-path + (if (> (string-length dir) 0) + (string-append dir "/" filename) + filename)))) )) ;; Get path to directory that contains the library @@ -316,9 +317,10 @@ (return f)))) (append prepend-dirs (list dir) append-dirs)) ;; Not found, just return base name - (if (> (string-length dir) 0) - (string-append dir "/" filename) - filename))) + (lib:check-system-path + (if (> (string-length dir) 0) + (string-append dir "/" filename) + filename)))) ;(if (tagged-list? 'scheme import) ; (string-append (Cyc-installation-dir 'sld) "/" path) ;; Built-in library ; path)