mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-12 14:50:19 +02:00
* guile-config.in (build-link): Fixed duplicate binding bug
reported by Ralf Mattes.
This commit is contained in:
parent
8bc4547c4e
commit
c2ab898653
1 changed files with 25 additions and 25 deletions
|
@ -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)))
|
|
||||||
|
|
||||||
(else (cons (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))))))))
|
||||||
|
|
||||||
;; 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.
|
||||||
(flags (cons (string-append "-L" (get-build-info 'libdir))
|
(let (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))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue