summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmeta/guile-tools11
-rw-r--r--meta/uninstalled-env.in2
-rw-r--r--module/scripts/snarf-guile-m4-docs.scm2
3 files changed, 11 insertions, 4 deletions
diff --git a/meta/guile-tools b/meta/guile-tools
index 6df88effa..c30f02655 100755
--- a/meta/guile-tools
+++ b/meta/guile-tools
@@ -22,8 +22,15 @@ exec guile $GUILE_FLAGS -e '(@@ (guile-tools) main)' -s "$0" "$@"
;;;; License along with this library; if not, write to the Free Software
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-(define-module (guile-tools)
- #:use-module (srfi srfi-1))
+(define-module (guile-tools))
+
+;; We can't import srfi-1, unfortunately, as we are used early in the
+;; boot process, before the srfi-1 shlib is built.
+
+(define (fold kons seed seq)
+ (if (null? seq)
+ seed
+ (fold kons (kons (car seq) seed) (cdr seq))))
(define (help)
(display "\
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 02c0e315e..56bbc307f 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -80,7 +80,7 @@ for dir in $subdirs_with_ltlibs ; do
done
LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH"
export LTDL_LIBRARY_PATH
-DYLD_LIBRARY_PATH="${dyld_prefix}${top_builddir}/libguile/.libs:$DYLD_LIBRARY_PATH"
+DYLD_LIBRARY_PATH="${dyld_prefix}$DYLD_LIBRARY_PATH"
export DYLD_LIBRARY_PATH
if [ x"$PKG_CONFIG_PATH" = x ]
diff --git a/module/scripts/snarf-guile-m4-docs.scm b/module/scripts/snarf-guile-m4-docs.scm
index 11fb82b3d..614fc0fe5 100644
--- a/module/scripts/snarf-guile-m4-docs.scm
+++ b/module/scripts/snarf-guile-m4-docs.scm
@@ -63,7 +63,7 @@
(else (car line)))
acc)))))
-(define (snarf-guile-m4-docs . args)
+(define (snarf-guile-m4-docs args)
(let* ((p (open-file (car args) "r"))
(next (lambda () (read-line p))))
(let loop ((line (next)) (acc #f))