mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

* guile-config.in (build-link): Really reverted the change of

Browse source 
2001-03-05.
This commit is contained in:
Mikael Djurfeldt 2001-03-08 02:43:20 +00:00
parent 7566791171
commit e96452c4e4
2 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
guile-config/ChangeLog
View file

@ -1,3 +1,8 @@
2001-03-07 Mikael Djurfeldt <mdj@linnaeus.mit.edu>
* guile-config.in (build-link): Really reverted the change of
2001-03-05.
2001-03-06 Dirk Herrmann <D.Herrmann@tu-bs.de> 2001-03-06 Dirk Herrmann <D.Herrmann@tu-bs.de>
* guile-config.in (build-link): Reverted the previous patch. * guile-config.in (build-link): Reverted the previous patch.

50
guile-config/guile-config.in
View file

@ -140,36 +140,36 @@
(string-append program-name (string-append program-name
" link: arguments to subcommand not yet implemented"))) " link: arguments to subcommand not yet implemented")))
(let ((flags (let* ((flags
(let loop ((libs (let loop ((libs
;; Get the string of linker flags we used to build ;; Get the string of linker flags we used to build
;; Guile, and break it up into a list. ;; Guile, and break it up into a list.
(separate-fields-discarding-char #\space (separate-fields-discarding-char #\space
(get-build-info 'LIBS) (get-build-info 'LIBS)
list))) list)))
(cond (cond
((null? libs) '()) ((null? libs) '())
;; Turn any "FOO/libBAR.a" elements into "-lBAR". ;; Turn any "FOO/libBAR.a" elements into "-lBAR".
((match-lib (car libs)) ((match-lib (car libs))
=> (lambda (bar) => (lambda (bar)
(cons (string-append "-l" bar) (cons (string-append "-l" bar)
(loop (cdr libs))))) (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. (else (cons (car libs) (loop (cdr libs)))))))
((string=? (car libs) "") (loop (cdr libs)))
(else (cons (car libs) (loop (cdr libs))))))))
;; Include libguile itself in the list, along with the ;; Include libguile itself in the list, along with the
;; directory it was installed in. ;; directory it was installed in.
(let (flags (cons (string-append "-L" (get-build-info 'libdir)) (flags (cons (string-append "-L" (get-build-info 'libdir))
(cons "-lguile" flags))) (cons "-lguile" flags))))
;; Display the flags, separated by spaces. ;; Display the flags, separated by spaces.
(display-separated flags) (display-separated flags)
(newline)))) (newline)))
(define (help-link) (define (help-link)
(let ((dle display-line-error)) (let ((dle display-line-error))