mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-20 03:30:27 +02:00
* guile-config.in (build-link): Really reverted the change of
2001-03-05.
This commit is contained in:
parent
7566791171
commit
e96452c4e4
2 changed files with 30 additions and 25 deletions
|
@ -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>
|
||||
|
||||
* guile-config.in (build-link): Reverted the previous patch.
|
||||
|
|
|
@ -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))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue