From e96452c4e4e799259119b8282f19dfabef04ee79 Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt Date: Thu, 8 Mar 2001 02:43:20 +0000 Subject: [PATCH] * guile-config.in (build-link): Really reverted the change of 2001-03-05. --- guile-config/ChangeLog | 5 ++++ guile-config/guile-config.in | 50 ++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/guile-config/ChangeLog b/guile-config/ChangeLog index 5d620b5a2..ac7fa0ef0 100644 --- a/guile-config/ChangeLog +++ b/guile-config/ChangeLog @@ -1,3 +1,8 @@ +2001-03-07 Mikael Djurfeldt + + * guile-config.in (build-link): Really reverted the change of + 2001-03-05. + 2001-03-06 Dirk Herrmann * guile-config.in (build-link): Reverted the previous patch. diff --git a/guile-config/guile-config.in b/guile-config/guile-config.in index 6bb8c1e59..0e917889c 100644 --- a/guile-config/guile-config.in +++ b/guile-config/guile-config.in @@ -140,36 +140,36 @@ (string-append program-name " link: arguments to subcommand not yet implemented"))) - (let ((flags - (let loop ((libs - ;; Get the string of linker flags we used to build - ;; Guile, and break it up into a list. - (separate-fields-discarding-char #\space - (get-build-info 'LIBS) - list))) + (let* ((flags + (let loop ((libs + ;; Get the string of linker flags we used to build + ;; Guile, and break it up into a list. + (separate-fields-discarding-char #\space + (get-build-info 'LIBS) + list))) - (cond - ((null? libs) '()) + (cond + ((null? libs) '()) - ;; Turn any "FOO/libBAR.a" elements into "-lBAR". - ((match-lib (car libs)) - => (lambda (bar) - (cons (string-append "-l" bar) - (loop (cdr libs))))) + ;; Turn any "FOO/libBAR.a" elements into "-lBAR". + ((match-lib (car libs)) + => (lambda (bar) + (cons (string-append "-l" bar) + (loop (cdr libs))))) + + ;; Remove any empty strings that may have seeped in there. + ((string=? (car libs) "") (loop (cdr libs))) - ;; Remove any empty strings that may have seeped in there. - ((string=? (car libs) "") (loop (cdr libs))) - - (else (cons (car libs) (loop (cdr libs)))))))) + (else (cons (car libs) (loop (cdr libs))))))) - ;; Include libguile itself in the list, along with the - ;; directory it was installed in. - (let (flags (cons (string-append "-L" (get-build-info 'libdir)) - (cons "-lguile" flags))) + ;; Include libguile itself in the list, along with the + ;; directory it was installed in. + (flags (cons (string-append "-L" (get-build-info 'libdir)) + (cons "-lguile" flags)))) - ;; Display the flags, separated by spaces. - (display-separated flags) - (newline)))) + ;; Display the flags, separated by spaces. + (display-separated flags) + (newline))) (define (help-link) (let ((dle display-line-error))